]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd5e578 f1ddc8c)
Merge branch 'je/doc-pull' into jch
authorJunio C Hamano <gitster@pobox.com>
Sun, 5 Oct 2025 22:04:16 +0000 (15:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 5 Oct 2025 22:04:16 +0000 (15:04 -0700)
Documentation updates.

* je/doc-pull:
  doc: git-pull: clarify how to exit a conflicted merge
  doc: git-pull: delete the example
  doc: git-pull: clarify options for integrating remote branch
  doc: git-pull: move <repository> and <refspec> params


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.