undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation: merge: move merge strategy list to end

Browse Source 
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:
Jonathan Nieder 2010-01-23 03:33:37 -06:00 committed by Thomas Rast
parent ed4a6baad0
commit a4081bacfc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-merge.txt
View File

@ -42,8 +42,6 @@ include::merge-options.txt[]
You need at least one <commit>. Specifying more than one
<commit> obviously means you are trying an Octopus.
include::merge-strategies.txt[]
HOW MERGE WORKS
---------------
@ -240,6 +238,8 @@ changes into a merge commit. Small fixups like bumping
release/version name would be acceptable.
include::merge-strategies.txt[]
CONFIGURATION
-------------
include::merge-config.txt[]