| commit | ed4a6baad0c8d446758eed8827e0d9190e624172 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Sat, 23 Jan 2010 09:31:19 +0000 (23 03:31 -0600) | ||
| committer | Thomas Rast <trast@student.ethz.ch> | |
| Sun, 24 Jan 2010 12:57:42 +0000 (24 13:57 +0100) | ||
| tree | 80ee7aaaf830759896cc99cb40b057a83cc5077b | treesnapshot (tar.gz zip) |
| parent | 35e9d6303c15faf01fc9551d5ed648564dcd4014 | commitdiff |
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>
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>
| Documentation/git-merge.txt | diffblobblamehistory |