]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'pb/doc-diff-format-updates' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 May 2026 01:32:34 +0000 (10:32 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 May 2026 01:32:34 +0000 (10:32 +0900)
Doc updates.

* pb/doc-diff-format-updates:
  diff-format.adoc: mode and hash are 0* for unmerged paths from index only
  diff-format.adoc: 'git diff-files' prints two lines for unmerged files
  diff-format.adoc: remove mention of diff-tree specific output


Trivial merge