git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Mon, 10 Jul 2017 20:58:57 +0000 (13:58 -0700)
committer	Junio C Hamano <redacted>
	Mon, 10 Jul 2017 20:58:57 +0000 (13:58 -0700)
commit	49771171e5b2802413a8645e8d1a25fafa5eca9f
tree	2e245edd0b950c2d5d5fdfd249f2e5b3aeb09ada	tree \| snapshot
parent	86d51bbe1aacc7574241a33c3667581640a23841	commit \| diff
parent	fe9e2aefd4adac63821d0c007effcc8087e32ad6	commit \| diff

Merge branch 'rs/pretty-add-again' into maint

The pretty-format specifiers like '%h', '%t', etc. had an
optimization that no longer works correctly. In preparation/hope
of getting it correctly implemented, first discard the optimization
that is broken.

* rs/pretty-add-again:
pretty: recalculate duplicate short hashes

pretty.c	diff1 \|	diff2 \|	blob \| history
strbuf.c	diff1 \|	diff2 \|	blob \| history
strbuf.h	diff1 \|	diff2 \|	blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT

pretty.c	diff1 \|	diff2 \|	blob \| history
strbuf.c	diff1 \|	diff2 \|	blob \| history
strbuf.h	diff1 \|	diff2 \|	blob \| history