development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Documentation: suggest reset --merge in How Merge Works section

Browse source 
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>
This commit is contained in:
Jonathan Nieder 2010-01-23 03:31:19 -06:00 committed by Thomas Rast
parent 35e9d6303c
commit ed4a6baad0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Documentation/git-merge.txt
View file

@ -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
---------------------------