diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-01-23 03:31:19 -0600 |
|---|---|---|
| committer |  Thomas Rast <trast@student.ethz.ch> | 2010-01-24 13:57:42 +0100 |
| commit | ed4a6baad0c8d446758eed8827e0d9190e624172 (patch) | |
| tree | 80ee7aaaf830759896cc99cb40b057a83cc5077b /Documentation/RelNotes-1.6.0.6.txt | |
| parent | Documentation: merge: move configuration section to end (diff) | |
| download | tgif-ed4a6baad0c8d446758eed8827e0d9190e624172.tar.xz | |
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/RelNotes-1.6.0.6.txt')
0 files changed, 0 insertions, 0 deletions