diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-03-15 01:00:18 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-03-15 01:00:18 +0000 |
| commit | 92faa8075fbefc0ac3d77a3c8b6f5b5f89f6d457 (patch) | |
| tree | e8722b56e18b1f7d36d0c25a179a518d1b310cb0 /git-rebase.txt | |
| parent | d353f737e574fe7e700e28217b131ab6346debff (diff) | |
| download | git-htmldocs-92faa8075fbefc0ac3d77a3c8b6f5b5f89f6d457.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-234-ga3513
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 96680c845..ac3589464 100644 --- a/git-rebase.txt +++ b/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 |