Re: stgit: lost all my patches again
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Nov 27, 2007, 22:24 UTC
- Message-ID
- <fii5dv$qc4$1@ger.gmane.org>
- In-Reply-To
- <9e4733910711271417l32ed9a77p9915aa34a780665b@mail.gmail.com>
Jon Smirl wrote:
Show 6 quoted lines
> My fingers are too trained in doing "git rebase linus/master" instead > of "stg rebase linus/master". This has resulting in me losing my patch > stack again. I updated stg to the current version and tried "stg > repair" put all my patches are still empty. > > What's the easiest way to recover?
git reset --hard $(cat .git/patches/<branch>/orig-base)
or perhaps "git reset --hard ORIG_HEAD"; with new rebase working on detached head "git reset --hard @{1}".
-- Jakub Narebski Warsaw, Poland ShadeHawk on #git