[PATCH v2 0/7] clarify 'git merge' documentation

For the previous round [1], I wrote something like this to clarify why merging with dirty trees is safe. I hope it also makes git-merge.1 more useful for other purposes. I have not changed the warning in question, which belongs to a different topic.

Patches 1-3 move some material towards the end of the 'merge' manual, to make the manpage easier to read straight through.

Patch 4 adds a brief introduction for the reader who might not yet be familiar with branching and merging. I am especially interested in feedback on this one. My writing tends not to be as clear as I would like. Already some advice from Junio helped a great deal.

Patches 5-7 organize the material on how the merge works into short, digestible pieces. Patch 5 explains how a merge can abort without doing anything, patch 6 the fast-forward merge, and patch 7 the true merge, all from the point of view of what matters for the person invoking ‘git merge’. Patch 7 is basically rewritten using Thomas’s advice.

The patches are against doc-style/for-next of Thomas’s repo at git://repo.or.cz/git/trast .

The advice from last round was very helpful. Apologies for taking so long to respond to it.

Enjoy,
Jonathan Nieder (7):
  Documentation: merge: move configuration section to end
  Documentation: suggest `reset --merge` in How Merge Works section
  Documentation: merge: move merge strategy list to end
  Documentation: merge: add an overview
  Documentation: emphasize when git merge terminates early
  Documentation: merge: add a section about fast-forward
  Documentation: simplify How Merge Works

 Documentation/git-merge.txt |  164 ++++++++++++++++++++++++-------------------
 1 files changed, 92 insertions(+), 72 deletions(-)

[1] http://thread.gmane.org/gmane.comp.version-control.git/136356/focus=136617