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 /Documentation/git-merge.txt | |
| 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 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 1fecedbbcf..83bf3e783f 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -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[] |