From: Jon Loeliger Date: Sat, 18 Mar 2006 00:25:30 +0000 (-0600) Subject: Clarify git-rebase example commands. X-Git-Tag: v1.3.0-rc1~22^2~4 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=228382aee45ec7f17db220e9099b46347ba2e1c7;p=git.git Clarify git-rebase example commands. Signed-off-by: Jon Loeliger Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 4d5b546d..b36276c7 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 branch to compare against. -:: +:: Working branch; defaults to HEAD. Author