summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-10 12:35:56 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-10 12:35:56 -0800
commit6a93158c334fae92c5ca969cd0d0725c90af6b54 (patch)
tree985b395452a3d8ceafe0110e42069339b890f219 /builtin-merge.c
parenta12e3cf3a2dbe61d2fc68b67d0db7af947795036 (diff)
parent1d46f2ea143534e46e6bfee3f34cd90b734bfe80 (diff)
downloadgit-6a93158c334fae92c5ca969cd0d0725c90af6b54.tar.gz
Merge branch 'jk/maint-format-patch-p-suppress-stat'
* jk/maint-format-patch-p-suppress-stat: format-patch: make "-p" suppress diffstat
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions