projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0cd28d7 7d50987)
Merge branch 'as/pretty-truncate' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Jun 2014 20:35:36 +0000 (13:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jun 2014 20:35:36 +0000 (13:35 -0700)
commitd8147a2c9130b1e306d5a092e3fbf40ac1ddc404
tree0a020168bf130f63409fb4288eea0534785d29edtree | snapshot
parent0cd28d72323112449ecfacfe345eabc8c58842f1commit | diff
parent7d509878b845a2a895cc880b833a016a06199981commit | diff
Merge branch 'as/pretty-truncate' into next

* as/pretty-truncate:
  pretty.c: format string with truncate respects logOutputEncoding
  t4205, t6006: add tests that fail with i18n.logOutputEncoding set
  t4205 (log-pretty-format): use `tformat` rather than `format`
  t4041, t4205, t6006, t7102: don't hardcode tested encoding value
  t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
pretty.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.