summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2010-11-19 12:54:24 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-24 15:13:58 -0800
commit79c461d5b1139afa3d3997c7ef9ee521562b2a1a (patch)
tree9c2a448451de36743086d85de936736b0daca1ca /Documentation/git-merge-tree.txt
parentMerge branch 'jl/maint-pull-tags-doc' (diff)
downloadtgif-79c461d5b1139afa3d3997c7ef9ee521562b2a1a.tar.xz
docs: default to more modern toolset
When the ASCIIDOC8 and ASCIIDOC_NO_ROFF knobs were built, many people were still on asciidoc 7 and using older versions of docbook-xsl. These days, even the almost 2-year-old Debian stable needs these knobs turned. So let's turn them by default. The new knobs ASCIIDOC7 and ASCIIDOC_ROFF can be used to get the old behavior if people are on older systems. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions