Commit Diff

Commit:
d10218e7512ce57d66ac7ef9f7a3caeab7874e8a
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
document new 'got rebase' behaviour when commits do not need to be rebased
Actions:
Patch | Tree
commit - 82d979c595ed3516ee1dbff4500ccd8cf84848ce
commit + d10218e7512ce57d66ac7ef9f7a3caeab7874e8a
blob - f0a19759ff8cd6e32301a3956c93992b0687c7e2
blob + 750f06d5450155907dcc4f4cffcbf08a151dc559
--- got/got.1
+++ got/got.1
@@ -1816,6 +1816,15 @@ commands will refuse to run while a rebase operation i
 Other commands which manipulate the work tree may be used for
 conflict resolution purposes.
 .Pp
+If the specified
+.Ar branch
+is already based on the work tree's current branch then no commits
+need to be rebased and
+.Cm got rebase
+will simply switch the work tree to the specified
+.Ar branch
+and update files in the work tree accordingly.
+.Pp
 The options for
 .Cm got rebase
 are as follows: