diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-merge.txt | 6 |
1 files changed, 3 insertions, 3 deletions
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 --------------------------- |