summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2006-03-18 00:25:30 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-18 04:42:33 (GMT)
commit228382aee45ec7f17db220e9099b46347ba2e1c7 (patch)
tree46dabcae67b6d57fa859763a0ea9438a63471bea /Documentation
parent81ea3ce2ace4d8b76dbfe2aa6b4199472115a115 (diff)
downloadgit-228382aee45ec7f17db220e9099b46347ba2e1c7.zip
git-228382aee45ec7f17db220e9099b46347ba2e1c7.tar.gz
git-228382aee45ec7f17db220e9099b46347ba2e1c7.tar.bz2
Clarify git-rebase example commands.
Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rebase.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 4d5b546..b36276c 100644
--- 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
-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
@@ -36,7 +36,7 @@ would be:
/
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
@@ -58,7 +58,7 @@ OPTIONS
<upstream>::
Upstream branch to compare against.
-<head>::
+<branch>::
Working branch; defaults to HEAD.
Author