diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-01-23 03:26:57 -0600 |
|---|---|---|
| committer | Thomas Rast <trast@student.ethz.ch> | 2010-01-24 13:57:42 +0100 |
| commit | 35e9d6303c15faf01fc9551d5ed648564dcd4014 (patch) | |
| tree | 254787d75772682e471ce1a72258c9db8110b7ac /Documentation/git-merge.txt | |
| parent | 2d0f686c44bfb7055b317d178b703078b76dcc4f (diff) | |
| download | git-35e9d6303c15faf01fc9551d5ed648564dcd4014.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-merge.txt')
| -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 c88bebe367..6aa2bf3701 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], |