Public Git Hosting - git/dscho.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: feee2da 2839478)

commit	2e4d30b8c69d8b1d09eb35ae65ab66cecd36b129
author	Junio C Hamano <gitster@pobox.com>
	Tue, 24 Aug 2010 18:17:53 +0000 (24 11:17 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 24 Aug 2010 18:17:53 +0000 (24 11:17 -0700)
tree	3c9f675ce3a481dd128e35755f85f0f6c5e2488f	tree \| snapshot (tar.gz zip)
parent	feee2da1e115ca7eb05a0988b6dcfb9310c095c3	commit \| diff
parent	2839478774f48074d7d87b8a9838827742a5b058	commit \| diff

Merge branch 'jc/maint-doc-em-dash' into next

* jc/maint-doc-em-dash:
Work around em-dash handling in newer AsciiDoc

Documentation/asciidoc.conf	diff1 \|	diff2 \|	blob \| history
Documentation/git-add.txt	diff1 \|	diff2 \|	blob \| history
Documentation/git-instaweb.txt	diff1 \|	diff2 \|	blob \| history

Dscho's miscellaneous git branches