commit 14c25ea21a5249517b484961e2c3b753ffb0454e
from: Stefan Sperling <stsp@stsp.name>
date: Tue Oct 15 12:05:06 2019 UTC

add a 'got integrate' example to the man page

commit - 3aef623b225b81a61fd3786dc79d091f47b68225
commit + 14c25ea21a5249517b484961e2c3b753ffb0454e
blob - 841f4902e5bee78beec97707fdf93aec1087eab9
blob + 07c1a76b07c5e373591b4238f041c215199048a2
--- got/got.1
+++ 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 ,