]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 86d51bb fe9e2ae)
Merge branch 'rs/pretty-add-again' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:58:57 +0000 (13:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:58:57 +0000 (13:58 -0700)
commit49771171e5b2802413a8645e8d1a25fafa5eca9f
tree2e245edd0b950c2d5d5fdfd249f2e5b3aeb09adatree | snapshot
parent86d51bbe1aacc7574241a33c3667581640a23841commit | diff
parentfe9e2aefd4adac63821d0c007effcc8087e32ad6commit | 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
Unnamed repository; edit this file 'description' to name the repository.