summaryrefslogtreecommitdiff
path: root/Documentation/asciidoc.conf
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-03-04 22:24:25 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-04 22:24:25 -0800
commit507665e4f4c87fa4ca8fbe8519e9d0cc36a93d3d (patch)
treec560c1c650fdc71a911cd7318d614f1441692d23 /Documentation/asciidoc.conf
parentStart preparing for 1.7.0.2 (diff)
parentMerge branch 'maint-1.6.5' into maint-1.6.6 (diff)
downloadtgif-507665e4f4c87fa4ca8fbe8519e9d0cc36a93d3d.tar.xz
Merge branch 'maint-1.6.6' into maint
* maint-1.6.6: Remove extra '-' from git-am(1)
Diffstat (limited to 'Documentation/asciidoc.conf')
0 files changed, 0 insertions, 0 deletions