diff options
| author |  Drew Northup <drew.northup@maine.edu> | 2011-03-14 11:47:37 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-03-14 10:52:23 -0700 |
| commit | ee55703bace45760c3385d00c9056d6f6f644229 (patch) | |
| tree | ee22cdb6d292a4af045722a298605faf921382a3 /Documentation | |
| parent | object.h: Remove obsolete struct object_refs (diff) | |
| download | tgif-ee55703bace45760c3385d00c9056d6f6f644229.tar.xz | |
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.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 96680c8456..ac35894640 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 |