Commit 7b0db533fcb3c8284a79a9c3af604ff417d5aee9

Stefan Sperling 2020-02-04T17:20:08

better description of the effects of 'got rebase' in got.1 EXAMPLES

diff --git a/got/got.1 b/got/got.1
index b985dca..709b284 100644
--- a/got/got.1
+++ b/got/got.1
@@ -1551,18 +1551,19 @@ repository with
 .Dl $ cd /var/git/repo
 .Dl $ git fetch
 .Pp
-Before outgoing changes on the local
+To make changes fetched from the remote repository appear on the
 .Dq master
-branch can be pushed to the remote repository, the local
+branch, the
 .Dq master
 branch must be rebased onto the
 .Dq origin/master
-branch:
+branch.
+This will also merge local changes, if any, with the incoming changes:
 .Pp
 .Dl $ got update -b origin/master
 .Dl $ got rebase master
 .Pp
-Changes on the local
+Local changes on the
 .Dq master
 branch can then be pushed to the remote
 repository with