Commit 14c25ea21a5249517b484961e2c3b753ffb0454e
2019-10-15T12:05:06
add a 'got integrate' example to the man page
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
diff --git a/got/got.1 b/got/got.1
index 841f490..07c1a76 100644
--- a/got/got.1
+++ b/got/got.1
@@ -1525,6 +1525,38 @@ repository with
.Pp
.Dl $ cd /var/git/repo
.Dl $ git push origin master
+.Pp
+In order to merge changes committed to the
+.Dq unified-buffer-cache
+branch back into the
+.Dq master
+branch, the
+.Dq unified-buffer-cache
+branch must first be rebased onto the
+.Dq master
+branch:
+.Pp
+.Dl $ got update -b master
+.Dl $ got rebase unified-buffer-cache
+.Pp
+Changes on the
+.Dq unified-buffer-cache
+branch can now be made visible on the
+.Dq master
+branch with
+.Cm got integrate .
+Because the rebase operation switched the work tree to the
+.Dq unified-buffer-cache
+branch, the work tree must be switched back to the
+.Dq master
+branch before the
+.Dq unified-buffer-cache
+branch can be integrated into
+.Dq master :
+.Pp
+.Dl $ got update -b master
+.Dl $ got integrate unified-buffer-cache
+.Pp
.Sh SEE ALSO
.Xr tog 1 ,
.Xr git-repository 5 ,