From: Andreas Schwab Date: Wed, 18 Jan 2012 22:01:39 GMT Subject: Re: modifying the commits before push Message-ID: In-Reply-To: <87sjjc3cpj.fsf@gnu.org> Sam Steingold writes: > alas, I could not push because the remote tree was modified in the > meantime, I pulled and now: > > # On branch master > # Your branch is ahead of 'origin/master' by 23 commits. What exactly did you do to get the additional 19 commits? > is there a way for me to get back my original 4 patches, reset my tree > (maybe by rm-rf+clone) and then re-apply them? You can find them in the reflog (git log -g). Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."