From: Jonathan Nieder Date: Sat, 23 Jan 2010 09:31:19 +0000 (-0600) Subject: Documentation: suggest `reset --merge` in How Merge Works section X-Git-Tag: v1.7.0-rc0~7^2~6 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ed4a6baad0c8d446758eed8827e0d9190e624172?ds=inline;hp=--cc Documentation: suggest `reset --merge` in How Merge Works section The 'merge' manual suggests 'reset' to cancel a merge at the end of the Merge Strategies list. It is more logical to explain this right before explaining how merge conflicts work, so the daunted reader can have a way out when he or she needs it most. While at it, make the advice more dependable and self-contained by providing the --merge option. Signed-off-by: Jonathan Nieder Signed-off-by: Thomas Rast --- ed4a6baad0c8d446758eed8827e0d9190e624172 diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 6aa2bf3701..1fecedbbcf 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -45,9 +45,6 @@ include::merge-options.txt[] include::merge-strategies.txt[] -If you tried a merge which resulted in complex conflicts and -want to start over, you can recover with 'git reset'. - HOW MERGE WORKS --------------- @@ -115,6 +112,9 @@ When there are conflicts, the following happens: same and the index entries for them stay as they were, i.e. matching `HEAD`. +If you tried a merge which resulted in complex conflicts and +want to start over, you can recover with `git reset --merge`. + HOW CONFLICTS ARE PRESENTED ---------------------------