in got.1 EXAMPLES, move the 'got integrate' example further up
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 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
diff --git a/got/got.1 b/got/got.1
index 8100849..7ef14b0 100644
--- a/got/got.1
+++ b/got/got.1
@@ -1804,6 +1804,36 @@ branch:
.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
@@ -1894,37 +1924,6 @@ 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
.Sh SEE ALSO
.Xr tog 1 ,
.Xr git-repository 5 ,