[PATCH] user-manual: Fix the interactive rebase example commit range
- From
W. Trevor King <wking@tremily.us>
- Date
- Mar 24, 2013, 12:23 UTC
- Message-ID
- <c29df638e260ab104bf940cc41ce5d75713707a8.1364127610.git.wking@tremily.us>
- In-Reply-To
- <7vobfg3tw8.fsf@alter.siamese.dyndns.org>
From: "W. Trevor King" <wking@tremily.us>
6c26bf4 (user-manual: Reorganize the reroll sections, adding 'git rebase -i', 2013-02-19) used deadbee as the oldest commit in the pick list, but as the final commit in the rebased range, due to sloppy duplication and extension from git-rebase.txt. This fixes that by adding a new HEAD commit.
I also reworded the example commit summaries (onelines), because I think my initial mistake may have been to to misinterpreting "this commit" as "HEAD" without thinking things through ;).
Signed-off-by: W. Trevor King <wking@tremily.us> --- Documentation/user-manual.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 5f36f81..a839e57 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2617,11 +2617,12 @@ This will open your editor with a list of steps to be taken to perform your rebase. ------------------------------------------------- -pick deadbee The oneline of this commit -pick fa1afe1 The oneline of the next commit +pick deadbee The oneline of HEAD~4 +pick fa1afe1 The oneline of HEAD~3 ... +pick 1cef15h The oneline of HEAD -# Rebase c0ffeee..deadbee onto c0ffeee +# Rebase c0ffeee..1cef15h onto c0ffeee # # Commands: # p, pick = use commit
-- 1.8.2.rc0.16.g20a599e