Code

Documentation: merge: move merge strategy list to end
authorJonathan Nieder <jrnieder@gmail.com>
Sat, 23 Jan 2010 09:33:37 +0000 (03:33 -0600)
committerThomas Rast <trast@student.ethz.ch>
Sun, 24 Jan 2010 12:57:42 +0000 (13:57 +0100)
commita4081bacfc78c1e1843590ed8d87544f3873dd10
tree5c21074e4db0d660b6d03859d92ce87f5b03259e
parented4a6baad0c8d446758eed8827e0d9190e624172
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>
Documentation/git-merge.txt