Drew Northup [off-list ref] writes:
-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`. If the rebase is aborted `topic` will
+remain the checked-out branch.
The behaviour is consistent between the case where "this on that" form
succeeds and it stops and gets aborted, and I think both are euqally
noteworthy. So I'd suggest dropping "if aborted".
On Sun, 2011-03-13 at 12:41 -0700, Junio C Hamano wrote:
Drew Northup [off-list ref] writes:
quoted
-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`. If the rebase is aborted `topic` will
+remain the checked-out branch.
The behaviour is consistent between the case where "this on that" form
succeeds and it stops and gets aborted, and I think both are euqally
noteworthy. So I'd suggest dropping "if aborted".
So a synthetic look at that might be:
-If the rebase is aborted
+When rebase exits
Comments?
I'll see about re-rolling likewise (and on something with a more recent
runtime!).
--
-Drew Northup
________________________________________________
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59
This change makes it clearer that while the change
to the history effected by executing
'git rebase master' and 'git rebase master topic'
(in the example given) will be the same the
implicit checkout of the second form will always
remain following the rebase.
Signed-off-by: Drew Northup <redacted>
---
This applies cleanly to both master and pu. Changed patch subject to
better match the amended contents.
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 96680c8..ac35894 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--
1.7.4
--
-Drew Northup
________________________________________________
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59