development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Documentation: merge: move configuration section to end

Browse source 
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:
Jonathan Nieder 2010-01-23 03:26:57 -06:00 committed by Thomas Rast
parent 2d0f686c44
commit 35e9d6303c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Documentation/git-merge.txt
View file

@ -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],