Documentation: merge: move configuration section to end
Configuration and environment variables belong to the back matter of a manual page. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Jonathan Nieder committed
Jan 23, 2010 at 03:26 UTC
35e9d6303c15faf01fc9551d5ed648564dcd4014
1 file changed
+9
-9
Documentation/git-merge.txt
+9
-9
@@ -48,15 +48,6 @@ include::merge-strategies.txt[]
48
If you tried a merge which resulted in complex conflicts and
49
want to start over, you can recover with 'git reset'.
50
51
-CONFIGURATION
52
--------------
53
-include::merge-config.txt[]
54
-
55
-branch.<name>.mergeoptions::
56
- Sets default options for merging into branch <name>. The syntax and
57
- supported options are the same as those of 'git merge', but option
58
- values containing whitespace characters are currently not supported.
59
-
51
HOW MERGE WORKS
52
---------------
53
@@ -249,6 +240,15 @@ changes into a merge commit. Small fixups like bumping
240
release/version name would be acceptable.
241
242
243
+CONFIGURATION
244
+-------------
245
+include::merge-config.txt[]
246
+
247
+branch.<name>.mergeoptions::
248
+ Sets default options for merging into branch <name>. The syntax and
249
+ supported options are the same as those of 'git merge', but option
250
+ values containing whitespace characters are currently not supported.
251
+
252
SEE ALSO
253
--------
254
linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1],