mirror of
https://github.com/git/git
synced 2024-08-27 03:29:21 +00:00
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>
This commit is contained in:
parent
2d0f686c44
commit
35e9d6303c
|
@ -48,15 +48,6 @@ include::merge-strategies.txt[]
|
||||||
If you tried a merge which resulted in complex conflicts and
|
If you tried a merge which resulted in complex conflicts and
|
||||||
want to start over, you can recover with 'git reset'.
|
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
|
SEE ALSO
|
||||||
--------
|
--------
|
||||||
linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1],
|
linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1],
|
||||||
|
|
Loading…
Reference in a new issue