X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-rebase.txt;h=b36276c7ed8dbb837cedfa833620fb843de89d90;hb=be1295d16a2593dcf468fef7d9e811d057d9039f;hp=f037d1280eb629339d82bb1eabf0ede7a1e25708;hpb=7465ef5155cec830a34dcffdd8272d4beb243220;p=git.git diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f037d128..b36276c7 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -3,7 +3,7 @@ git-rebase(1) NAME ---- -git-rebase - Rebase local commits to new upstream head. +git-rebase - Rebase local commits to new upstream head SYNOPSIS -------- @@ -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