diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-01-23 09:31:19 (GMT) |
|---|---|---|
| committer | Thomas Rast <trast@student.ethz.ch> | 2010-01-24 12:57:42 (GMT) |
| commit | ed4a6baad0c8d446758eed8827e0d9190e624172 (patch) | |
| tree | 80ee7aaaf830759896cc99cb40b057a83cc5077b /Documentation | |
| parent | 35e9d6303c15faf01fc9551d5ed648564dcd4014 (diff) | |
| download | git-ed4a6baad0c8d446758eed8827e0d9190e624172.zip git-ed4a6baad0c8d446758eed8827e0d9190e624172.tar.gz git-ed4a6baad0c8d446758eed8827e0d9190e624172.tar.bz2 | |
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 <jrnieder@gmail.com>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
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 6aa2bf3..1fecedb 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 --------------------------- |