diff options
| author | Julia Evans <julia@jvns.ca> | 2025-10-15 13:13:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-15 13:17:52 -0700 |
| commit | e9d221b0b70869fa770e95acf143149c0b8705f6 (patch) | |
| tree | dc21f0447a02b19bf22035026a43dc8d3a0c81ba /t/t4013/diff.diff-tree_--cc_--patch-with-stat_master | |
| parent | d8942ac494fb08b5b99a3eb6fb6a2853a0232d21 (diff) | |
doc: git-pull: clarify how to exit a conflicted merge
From user feedback:
- One user is confused about why `git reset --merge`
(why not just `git reset`?). Handle this by mentioning
`git merge --abort` and `git reset --abort` instead, which have a
more obvious meaning.
- 2 users want to know what "In older versions of Git" means exactly
(in versions older than 1.7.0). Handle this by removing the warning
since it was added 15 years ago (in 3f8fc184c0e2c)
Signed-off-by: Julia Evans <julia@jvns.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff-tree_--cc_--patch-with-stat_master')
0 files changed, 0 insertions, 0 deletions