diff options
| author | Drew Northup <drew.northup@maine.edu> | 2011-03-14 15:47:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-14 17:52:23 (GMT) |
| commit | ee55703bace45760c3385d00c9056d6f6f644229 (patch) | |
| tree | ee22cdb6d292a4af045722a298605faf921382a3 /git-merge-resolve.sh | |
| parent | 0564d937bfac6729dac8ea5a2b15de52fcd4b8ec (diff) | |
| download | git-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 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions