mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Documentation: merge: move merge strategy list to end
So the section layout changes as follows: NAME SYNOPSIS DESCRIPTION OPTIONS -MERGE STRATEGIES HOW MERGE WORKS HOW CONFLICTS ARE PRESENTED HOW TO RESOLVE CONFLICTS EXAMPLES +MERGE STRATEGIES CONFIGURATION SEE ALSO AUTHOR DOCUMENTATION GIT NOTES The first-time user will care more about conflicts than about strategies other than 'recursive'. One of the examples uses -s ours, but I do not think this hinders readability. Suggested-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Thomas Rast <trast@student.ethz.ch>
This commit is contained in:
parent
ed4a6baad0
commit
a4081bacfc
|
@ -42,8 +42,6 @@ include::merge-options.txt[]
|
||||||
You need at least one <commit>. Specifying more than one
|
You need at least one <commit>. Specifying more than one
|
||||||
<commit> obviously means you are trying an Octopus.
|
<commit> obviously means you are trying an Octopus.
|
||||||
|
|
||||||
include::merge-strategies.txt[]
|
|
||||||
|
|
||||||
|
|
||||||
HOW MERGE WORKS
|
HOW MERGE WORKS
|
||||||
---------------
|
---------------
|
||||||
|
@ -240,6 +238,8 @@ changes into a merge commit. Small fixups like bumping
|
||||||
release/version name would be acceptable.
|
release/version name would be acceptable.
|
||||||
|
|
||||||
|
|
||||||
|
include::merge-strategies.txt[]
|
||||||
|
|
||||||
CONFIGURATION
|
CONFIGURATION
|
||||||
-------------
|
-------------
|
||||||
include::merge-config.txt[]
|
include::merge-config.txt[]
|
||||||
|
|
Loading…
Reference in a new issue