Skip to content

Commit ee55703

Browse files
dnorthup-umsgitster
authored andcommitted
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>
1 parent 0564d93 commit ee55703

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Documentation/git-rebase.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@ would be:
6666
D---E---F---G master
6767
------------
6868

69-
The latter form is just a short-hand of `git checkout topic`
70-
followed by `git rebase master`.
69+
*NOTE:* The latter form is just a short-hand of `git checkout topic`
70+
followed by `git rebase master`. When rebase exits `topic` will
71+
remain the checked-out branch.
7172

7273
If the upstream branch already contains a change you have made (e.g.,
7374
because you mailed a patch which was applied upstream), then that commit

0 commit comments

Comments
 (0)