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 | |
| parent | d8942ac494fb08b5b99a3eb6fb6a2853a0232d21 (diff) | |
| download | git-e9d221b0b70869fa770e95acf143149c0b8705f6.tar.gz | |
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>
| -rw-r--r-- | Documentation/git-pull.adoc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Documentation/git-pull.adoc b/Documentation/git-pull.adoc index 273172aa80..cd3bbc90e3 100644 --- a/Documentation/git-pull.adoc +++ b/Documentation/git-pull.adoc @@ -36,15 +36,9 @@ There are 4 main options for integrating the remote branch: You can also set the configuration options `pull.rebase`, `pull.squash`, or `pull.ff` with your preferred behaviour. -In Git 1.7.0 or later, to cancel a conflicting merge, use -`git reset --merge`. *Warning*: In older versions of Git, running 'git pull' -with uncommitted changes is discouraged: while possible, it leaves you -in a state that may be hard to back out of in the case of a conflict. - -If any of the remote changes overlap with local uncommitted changes, -the merge will be automatically canceled and the work tree untouched. -It is generally best to get any local changes in working order before -pulling or stash them away with linkgit:git-stash[1]. +If there's a merge conflict during the merge or rebase that you don't +want to handle, you can safely abort it with `git merge --abort` or `git +--rebase abort`. OPTIONS ------- |