freshlybakedca.ke / git
Git fork
fork atom

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>

authored by

Julia Evans and committed by
Junio C Hamano e9d221b0 d8942ac4

+3 -9
unified split
+3 -9
Documentation/git-pull.adoc
··· 36 You can also set the configuration options `pull.rebase`, `pull.squash`, 37 or `pull.ff` with your preferred behaviour. 38 39 - In Git 1.7.0 or later, to cancel a conflicting merge, use 40 - `git reset --merge`. *Warning*: In older versions of Git, running 'git pull' 41 - with uncommitted changes is discouraged: while possible, it leaves you 42 - in a state that may be hard to back out of in the case of a conflict. 43 - 44 - If any of the remote changes overlap with local uncommitted changes, 45 - the merge will be automatically canceled and the work tree untouched. 46 - It is generally best to get any local changes in working order before 47 - pulling or stash them away with linkgit:git-stash[1]. 48 49 OPTIONS 50 -------
··· 36 You can also set the configuration options `pull.rebase`, `pull.squash`, 37 or `pull.ff` with your preferred behaviour. 38 39 + If there's a merge conflict during the merge or rebase that you don't 40 + want to handle, you can safely abort it with `git merge --abort` or `git 41 + --rebase abort`. 42 43 OPTIONS 44 -------