diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-01-23 03:33:37 -0600 |
|---|---|---|
| committer | Thomas Rast <trast@student.ethz.ch> | 2010-01-24 13:57:42 +0100 |
| commit | a4081bacfc78c1e1843590ed8d87544f3873dd10 (patch) | |
| tree | 5c21074e4db0d660b6d03859d92ce87f5b03259e /run-command.c | |
| parent | ed4a6baad0c8d446758eed8827e0d9190e624172 (diff) | |
| download | git-a4081bacfc78c1e1843590ed8d87544f3873dd10.tar.gz | |
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>
Diffstat (limited to 'run-command.c')
0 files changed, 0 insertions, 0 deletions