From: Jonathan Nieder Date: Sat, 23 Jan 2010 09:26:57 +0000 (-0600) Subject: Documentation: merge: move configuration section to end X-Git-Tag: v1.7.0-rc0~7^2~7 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=35e9d6303c15faf01fc9551d5ed648564dcd4014;p=git.git 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 Acked-by: Petr Baudis Signed-off-by: Thomas Rast --- diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index c88bebe36..6aa2bf370 100644 --- 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'. -CONFIGURATION -------------- -include::merge-config.txt[] - -branch..mergeoptions:: - Sets default options for merging into branch . 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 --------------- @@ -249,6 +240,15 @@ changes into a merge commit. Small fixups like bumping release/version name would be acceptable. +CONFIGURATION +------------- +include::merge-config.txt[] + +branch..mergeoptions:: + Sets default options for merging into branch . 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],