[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Staging/Master Merge - James' Patchy

From: David Kastrup
Subject: Re: Staging/Master Merge - James' Patchy
Date: Wed, 11 Apr 2012 14:16:00 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux)

"Phil Holmes" <address@hidden> 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 "address@hidden minutes ago}"

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

David Kastrup

reply via email to

[Prev in Thread] Current Thread [Next in Thread]