Commit 2af6173593a21a43c9ee858646ac68d812039e12

Stefan Sperling 2021-11-03T22:13:50

document new 'got rebase' behaviour when commits do not need to be rebased

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
diff --git a/got/got.1 b/got/got.1
index f0a1975..750f06d 100644
--- a/got/got.1
+++ b/got/got.1
@@ -1816,6 +1816,15 @@ commands will refuse to run while a rebase operation is in progress.
 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: