summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorDrew Northup <drew.northup@maine.edu>2011-03-14 15:47:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-14 17:52:23 (GMT)
commitee55703bace45760c3385d00c9056d6f6f644229 (patch)
treeee22cdb6d292a4af045722a298605faf921382a3 /Documentation
parent0564d937bfac6729dac8ea5a2b15de52fcd4b8ec (diff)
downloadgit-ee55703bace45760c3385d00c9056d6f6f644229.zip
git-ee55703bace45760c3385d00c9056d6f6f644229.tar.gz
git-ee55703bace45760c3385d00c9056d6f6f644229.tar.bz2
Documentation: "rebase <onto> <that>" stays on <that> 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 <drew.northup@maine.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rebase.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 96680c8..ac35894 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