From: Drew Northup Date: Mon, 14 Mar 2011 15:47:37 +0000 (-0400) Subject: Documentation: "rebase " stays on branch upon exit X-Git-Tag: v1.7.5-rc0~83 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ee55703bace45760c3385d00c9056d6f6f644229;p=git.git Documentation: "rebase " stays on branch upon exit This change makes it clearer that the change to the history effected by executing 'git rebase master' while on 'topic' branch, and by executing 'git rebase master topic' on any branch, will be the same; the implicit checkout of the second form will remain after the rebase exits. Signed-off-by: Drew Northup Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 96680c845..ac3589464 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -66,8 +66,9 @@ would be: D---E---F---G master ------------ -The latter form is just a short-hand of `git checkout topic` -followed by `git rebase master`. +*NOTE:* The latter form is just a short-hand of `git checkout topic` +followed by `git rebase master`. When rebase exits `topic` will +remain the checked-out branch. If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit