commit - 469dd7264e07bc434adc24b250cd154db9e18d02
commit + bf390dec53aed4703d097ffde8b0774b7e344cb9
blob - 81008498da32f07c86f4e614d70cc4e5a73f817a
blob + 7ef14b0e01ad8ba85e33167d00f016bc63ff23ff
--- got/got.1
+++ got/got.1
.Dl $ got update -b unified-buffer-cache
.Dl $ got update -c master
.Dl $ got histedit
+.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
Additional steps may be necessary if local changes need to be pushed back
to the remote repository, which currently requires
.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
.Sh SEE ALSO
.Xr tog 1 ,
.Xr git-repository 5 ,
