]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1fc3c0a) | patch
merge-tree: update documentation for differences in -z output
authorElijah Newren <newren@gmail.com>
Sun, 23 Oct 2022 01:28:04 +0000 (01:28 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Oct 2022 05:21:24 +0000 (22:21 -0700)
commita9f5bb83e0341a04c46b2dec27e16c793d6447f8
tree7bdc3e7bb8a1a66d421735988b67b9a774c3ea8btree | snapshot
parent1fc3c0ad407008c2f71dd9ae1241d8b75f8ef886commit | diff
merge-tree: update documentation for differences in -z output

The Informational Messages was updated in de90581141 ("merge-ort:
optionally produce machine-readable output", 2022-06-18) to provide more
detailed and machine parseable output when `-z` is passed, but the
Documentation was not updated to reflect these changes.  Update it now.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-merge-tree.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.