Commit Diff

Commit:
7b0db533fcb3c8284a79a9c3af604ff417d5aee9
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
better description of the effects of 'got rebase' in got.1 EXAMPLES
Actions:
Patch | Tree
commit - 87ca24acee90c090249dd4e354491950479531bd
commit + 7b0db533fcb3c8284a79a9c3af604ff417d5aee9
blob - b985dcaa2793fb4ef25cf92851b2e55e53529536
blob + 709b28475adcddd7a3952eb8c6d2cfcc50a08386
--- got/got.1
+++ 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