From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Oct 2025 18:38:58 +0000 (-0700)
Subject: Merge branch 'je/doc-pull'
X-Git-Tag: v2.52.0-rc0~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e746434e80e52f251c16df32d591639fdd2f53c;p=thirdparty%2Fgit.git

Merge branch 'je/doc-pull'

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

0e746434e80e52f251c16df32d591639fdd2f53c