From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2025 05:57:48 +0000 (+0900)
Subject: Merge branch 'kh/doc-replay-updates'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a3051d3c200f0b40bf611338406af849de3d313;p=thirdparty%2Fgit.git

Merge branch 'kh/doc-replay-updates'

"git replay" documentation updates.

* kh/doc-replay-updates:
  doc: replay: link section using markup
  replay: improve --contained and add to doc
  doc: replay: mention no output on conflicts
---

6a3051d3c200f0b40bf611338406af849de3d313