From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 5 Oct 2025 22:04:16 +0000 (-0700)
Subject: Merge branch 'je/doc-pull' into jch
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=412b031b4d977797f34d35f0eb9ced31678529c4;p=thirdparty%2Fgit.git

Merge branch 'je/doc-pull' into jch

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
---

412b031b4d977797f34d35f0eb9ced31678529c4