]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commitfe8d31e9f93b6b0935c1aa5d6d0d15031a1c0ecb
treeba6cd0ae7669e268364214aee134cd11d3f7ea24
parent4f17f83d099599a26da02799bd26e67a1ae69290
parent6d09e798bcfba92ef071abb27ad807985681122c
Merge branch 'pb/doc-diff-format-updates' into next

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