diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-22 11:14:46 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-22 11:14:46 +0900 |
| commit | bac754eadb041ee3e609d3f96d26336d46498edf (patch) | |
| tree | faea8559b07d53da6522cf107a58ad6f5ab13c29 /Documentation/git-diff-tree.txt | |
| parent | ec8fcc780cab5bc4d8aa0489267cd426506d1daf (diff) | |
| parent | 37fc8cb15faeec4e216e50d93fb9c96ee01ad16a (diff) | |
| download | git-bac754eadb041ee3e609d3f96d26336d46498edf.tar.xz | |
Merge branch 'sg/asciidoctor-in-ci'
Update our support to format documentation in the CI environment,
either with AsciiDoc ro Asciidoctor.
* sg/asciidoctor-in-ci:
ci: fix AsciiDoc/Asciidoctor stderr check in the documentation build job
ci: stick with Asciidoctor v1.5.8 for now
ci: install Asciidoctor in 'ci/install-dependencies.sh'
Documentation/technical/protocol-v2.txt: fix formatting
Documentation/technical/api-config.txt: fix formatting
Documentation/git-diff-tree.txt: fix formatting
Diffstat (limited to 'Documentation/git-diff-tree.txt')
| -rw-r--r-- | Documentation/git-diff-tree.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index 24f32e8c54..5c8a2a5e97 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -118,6 +118,7 @@ include::pretty-options.txt[] include::pretty-formats.txt[] + include::diff-format.txt[] GIT |