git/Documentation/git-diff-tree.txt, branch v2.45.3Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.45.32023-10-09T19:06:47Zdocumentation: add missing fullstops2023-10-09T19:06:47ZElijah Newrennewren@gmail.com2023-10-08T06:45:25Zurn:sha1:845c6ca90e806ac402cd9f1c981844531176475f
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
documentation: fix capitalization2023-10-09T19:06:29ZElijah Newrennewren@gmail.com2023-10-08T06:45:22Zurn:sha1:2150b6fb473fe965edc5bbdbcf3b264bdfe544db
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
documentation: add missing article2023-10-09T19:06:29ZElijah Newrennewren@gmail.com2023-10-08T06:45:17Zurn:sha1:0a4f051f9318c3dd9db69c4bebecdc6d160a5fc6
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
documentation: fix subject/verb agreement2023-10-09T19:06:29ZElijah Newrennewren@gmail.com2023-10-08T06:45:09Zurn:sha1:ce14cc0b00098201f967346955804abd774174ea
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
documentation: remove extraneous words2023-10-09T19:06:29ZElijah Newrennewren@gmail.com2023-10-08T06:45:08Zurn:sha1:859a6d6045e338a337cb7499100b1fa31c367fbf
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
documentation: wording improvements2023-10-09T19:04:21ZElijah Newrennewren@gmail.com2023-10-08T06:45:03Zurn:sha1:cf6cac20059123d6ec3f867bb3692df62db52cf9
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
doc: use only hyphens as word separators in placeholders2021-11-09T17:39:11ZJean-Noël Avilajn.avila@free.fr2021-11-06T18:48:52Zurn:sha1:133db54dabd2174960d4a7449a1a7ed574ea0ad3
According to CodingGuidelines, multi-word placeholders should use
hyphens as word separators.
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Reviewed-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/diff-tree: learn --merge-base2020-09-21T20:37:03ZDenton Liuliu.denton@gmail.com2020-09-14T18:36:52Zurn:sha1:3d09c22869a7bd47f1683031937af0ed93b2fa3b
The previous commit introduced ---merge-base a way to take the diff
between the working tree or index and the merge base between an arbitrary
commit and HEAD. It makes sense to extend this option to support the
case where two commits are given too and behave in a manner identical to
`git diff A...B`.
Introduce the --merge-base flag as an alternative to triple-dot
notation. Thus, we would be able to write the above as
`git diff --merge-base A B`.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-diff-tree.txt: fix formatting2019-04-01T06:17:47ZSZEDER Gáborszeder.dev@gmail.com2019-03-29T12:35:15Zurn:sha1:98228427781c5533f49238570ba22904791cb2de
Asciidoctor versions v1.5.7 or later print the following warning while
building the documentation:
ASCIIDOC git-diff-tree.xml
asciidoctor: WARNING: diff-format.txt: line 2: unterminated listing block
This highlights an issue (even with older Asciidoctor versions) where
the "Raw output format" header is not rendered as a header, and the
rest of the document is rendered in monospace. This is not caused by
'diff-format.txt' in itself, but rather by 'git-diff-tree.txt'
including 'pretty-formats.txt' and 'diff-format.txt' on subsequent
lines, while the former happens to end with monospace-formatted
example commands.
Fix this by inserting an empty line between the two include::
directives.
The page rendered with AsciiDoc doesn't have this formatting issue.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'en/combined-all-paths'2019-03-07T00:59:54ZJunio C Hamanogitster@pobox.com2019-03-07T00:59:54Zurn:sha1:c425d361f5bf46d99cd96d7eac3488ebb2e92b60
Output from "diff --cc" did not show the original paths when the
merge involved renames. A new option adds the paths in the
original trees to the output.
* en/combined-all-paths:
log,diff-tree: add --combined-all-paths option