development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Documentation: "rebase <onto> <that>" stays on <that> branch upon exit

Browse source 
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>
This commit is contained in:
Drew Northup 2011-03-14 11:47:37 -04:00 committed by Junio C Hamano
parent 0564d937bf
commit ee55703bac
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Documentation/git-rebase.txt
View file

@ -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