From: Jonathan Nieder Date: Sat, 23 Jan 2010 09:33:37 GMT Subject: [PATCH 3/7] Documentation: merge: move merge strategy list to end Message-ID: <20100123093337.GD7571@progeny.tock> In-Reply-To: <20100123092551.GA7571@progeny.tock> 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 Signed-off-by: Jonathan Nieder --- Thomas Rast wrote [1]: > While I agree with the general intent of deferring the strategies > further back, wouldn't it be better go all the way and instead put > them before (or even after, but one of them uses -s ours) "EXAMPLES"? > The average user will care more about conflicts than about strategies > other than 'recursive'. Good idea. Thanks! [1] http://thread.gmane.org/gmane.comp.version-control.git/136356/focus=136679 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 1fecedb..83bf3e7 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -42,8 +42,6 @@ include::merge-options.txt[] You need at least one . Specifying more than one 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[] -- 1.6.6