]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0e2c99 7d50987)
Merge branch 'as/pretty-truncate'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 17:07:12 +0000 (10:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 17:07:12 +0000 (10:07 -0700)
* 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

1  2 
pretty.c patch | diff1 | diff2 | blob | history

diff --cc pretty.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.