"Phil Holmes" <m...@philholmes.net> writes:

>> No way to sort the patches in a manner where they work out at every
>> step?
>
> It may well have been, but it would have taken far more effort than
> compressing them into a single commit.  At that point, my brain was
> already hurting.

_Please_ check out git rebase -i.  For rearranging the last five
commits, you call

git rebase -i HEAD~5

and the rest explains itself.  And in case you mess up royally for
whatever reason,

git reset --hard "HEAD@{5 minutes ago}"

will put you back to where you started 5 minutes ago.

-- 
David Kastrup


_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to