OSDN Git Service

(root) / git-core / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96db324 b9c7d6e)
Merge branch 'jk/pretty-empty-format' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 21:05:09 +0000 (14:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 21:05:09 +0000 (14:05 -0700)
* jk/pretty-empty-format:
  pretty: make empty userformats truly empty
  pretty: treat "--format=" as an empty userformat
  revision: drop useless string offset when parsing "--pretty"

1  2 
combine-diff.c patch | diff1 | diff2 | blob | history

diff --cc combine-diff.c
Simple merge
Mirror of official git.git repository
About OSDN
Find Software
Develop Software
Help