[Libreoffice] Moving duplicate code into methods
michael.meeks at novell.com
Mon May 9 02:08:50 PDT 2011
On Sat, 2011-05-07 at 22:54 +0200, Chr. Rossmanith wrote:
> I've used the method names Thorsten suggested, prefixed them with lcl_
> made them static and end up with two commits for the whole clean up
> (stage 1 posted on the list, stage 2 improvements). Is that ok for
> pushing or should I somehow join the two commits into a single one?
That is fine of course; if you know you're going to want to squash
commits together, doing:
git commit -a --amend
is your friend - that just stacks it onto your last commit: of course,
that must not have been pushed by that stage (or you'll bust the public
history of course).
git rebase -i HEAD~2
should allow you to squash commits together, but there's no problem
really with two commits here.
michael.meeks at novell.com <><, Pseudo Engineer, itinerant idiot
More information about the LibreOffice