diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-merge.txt | 18 |
1 files changed, 9 insertions, 9 deletions
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.<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 --------------- @@ -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.<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], |