kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

doc: git-pull: link to new merge conflicts guide 

Signed-off-by: Julia Evans <julia@jvns.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
seen
Julia Evans 2026-10-12 14:53:15 +00:00 committed by Junio C Hamano
parent 0ef2da01fb
commit 71b0f996a4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-pull.adoc
View File

@ -38,7 +38,8 @@ or `pull.ff` with your preferred behaviour.

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`.
`git rebase --abort`. See linkgit:gitmergeconflicts[7]
(or `git help mergeconflicts`) for a guide to handling merge conflicts.

OPTIONS
-------