From: Jonathan Nieder Date: Wed, 10 Nov 2010 01:56:23 GMT Subject: Re: [PATCH] git-rebase--interactive.sh: Add new command "shell" Message-ID: <20101110015623.GC1503@burratino> In-Reply-To: <833D47AD-041C-47BF-9AF3-69FD97F42712@sb.org> Kevin Ballard wrote: > On Nov 9, 2010, at 5:42 PM, Jonathan Nieder wrote: >> Yann Dirson wrote: >>> |Keep in mind that any commit in the original todo list, that would >>> |not be there after your edits, would not be included in the resulting >>> |rebased branch. In case you realize afterwards that you need such a >>> |commit, you can still access it as an ancestor of @{1}, see >>> |git-reflog(1) for details. >> >> Do you mean @{-1}? > > @{-1} is the previously-checked-out branch. @{1} is the previous commit > that the current branch was pointing to. I believe @{1} is correct here. Ah, this is after a successful rebase, so @{1} is a synonym for ORIG_HEAD. Sorry for the noise.