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>

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index c88bebe367b56d872baa2a298b62aa64d6df4a4c..6aa2bf3701a892471388da6766c1f8f297c709a5 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -48,15 +48,6 @@ include::merge-strategies.txt[]
 If you tried a merge which resulted in complex conflicts and
 want to start over, you can recover with 'git reset'.
 
 If you tried a merge which resulted in complex conflicts and
 want to start over, you can recover with 'git reset'.
 

-CONFIGURATION
--------------
-include::merge-config.txt[]
-
-branch.<name>.mergeoptions::
-       Sets default options for merging into branch <name>. The syntax and
-       supported options are the same as those of 'git merge', but option
-       values containing whitespace characters are currently not supported.
-

 HOW MERGE WORKS
 ---------------
 
 HOW MERGE WORKS
 ---------------
 


@@ -249,6 +240,15 @@ changes into a merge commit.  Small fixups like bumping
 release/version name would be acceptable.
 
 
 release/version name would be acceptable.
 
 

+CONFIGURATION
+-------------
+include::merge-config.txt[]
+
+branch.<name>.mergeoptions::
+       Sets default options for merging into branch <name>. The syntax and
+       supported options are the same as those of 'git merge', but option
+       values containing whitespace characters are currently not supported.
+

 SEE ALSO
 --------
 linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1],
 SEE ALSO
 --------
 linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1],