Commit Diff

Commit:
1fa75a87f7cf94849260387869faae04e32a6f2a
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
tweak wording in got.1 which suggested that use of rebase was mandatory
Actions:
Patch | Tree
commit - f357763f32830a6499489869d8501ddd01f9c3e3
commit + 1fa75a87f7cf94849260387869faae04e32a6f2a
blob - 785cef7abb14809b005cec30c4c76f9901154c6f
blob + 447995be3b3f129a589570c0ee74d37146139bca
--- got/got.1
+++ got/got.1
@@ -3541,7 +3541,7 @@ instead of
 The latter is only needed in case of ambiguity.
 .Pp
 .Cm got rebase
-must be used to merge changes which are visible on the
+can be used to merge changes which are visible on the
 .Dq origin/master
 branch into the
 .Dq master
@@ -3557,7 +3557,7 @@ visible on the
 .Dq master
 branch, the
 .Dq unified-buffer-cache
-branch must first be rebased onto the
+branch can be rebased onto the
 .Dq master
 branch:
 .Pp