Andrew's git / gitweb.git / diff
?
Clarify git-rebase example commands.
authorJon Loeliger <jdl@jdl.com>
Sat, 18 Mar 2006 00:25:30 +0000 (18:25 -0600)
committerJunio C Hamano <junkio@cox.net>
Sat, 18 Mar 2006 04:42:33 +0000 (20:42 -0800)
Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-rebase.txt patch | blob | history
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 4d5b546db183ab51357a0749376fd5f397cac9e8..b36276c7ed8dbb837cedfa833620fb843de89d90 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -25,7 +25,7 @@ Assume the following history exists and the current branch is "topic":
          /
     D---E---F---G master
 
          /
     D---E---F---G master
 
-From this point, the result of the following commands:
+From this point, the result of either of the following commands:
 
     git-rebase master
     git-rebase master topic
 
     git-rebase master
     git-rebase master topic
@@ -36,7 +36,7 @@ would be:
                  /
     D---E---F---G master
 
                  /
     D---E---F---G master
 
-While, starting from the same point, the result of the following
+While, starting from the same point, the result of either of the following
 commands:
 
     git-rebase --onto master~1 master
 commands:
 
     git-rebase --onto master~1 master
@@ -58,7 +58,7 @@ OPTIONS
 <upstream>::
        Upstream branch to compare against.
 
 <upstream>::
        Upstream branch to compare against.
 
-<head>::
+<branch>::
        Working branch; defaults to HEAD.
 
 Author
        Working branch; defaults to HEAD.
 
 Author