[PATCH] user-manual: Fix the interactive rebase example commit range

2013-03-24 Thread W. Trevor King
From: W. Trevor King wk...@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 wk...@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

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] user-manual: Fix the interactive rebase example commit range

2013-03-24 Thread Eric Sunshine
On Sun, Mar 24, 2013 at 8:23 AM, W. Trevor King wk...@tremily.us wrote:
 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

s/to to/due to/

 commit as HEAD without thinking things through ;).
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] user-manual: Fix the interactive rebase example commit range

2013-03-24 Thread W. Trevor King
On Sun, Mar 24, 2013 at 04:00:17PM -0400, Eric Sunshine wrote:
 On Sun, Mar 24, 2013 at 8:23 AM, W. Trevor King wk...@tremily.us wrote:
  I also reworded the example commit summaries (onelines), because I
  think my initial mistake may have been to to misinterpreting this
 
 s/to to/due to/

Oops, thanks :).


signature.asc
Description: OpenPGP digital signature