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.
>> Maybe we could list a copy of the todo list in the comments, as a
>> reference for double-checking. Such a list could even be used for a
>> final check before applying, that would ask confirmation if the set of
>> patches has changed, and offer to edit again. The same config item
>> (eg. advice.interactiveRebase ?) could be used to hide the note and
>> the check.
>
> Mm, but intentionally dropping commits is common, no?
>
> What would be nice is to be able to do
>
> git rebase --change-of-plans
>
> and somehow get my editor of choice to open with the original todo
> list (read-only) and the current todo list (read/write).
>
> Well, a person can dream. :)
Not a bad idea. It would be especially nice if you could then selectively
roll back to the state after previous entries in your todo list so you
could change something you've done without having to start all over again.
-Kevin Ballard
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html