Andrew's git / gitweb.git / diff
?
Merge branch 'as/diff-shortstat-ignore-binary'
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Jun 2012 22:00:53 +0000 (15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Jun 2012 22:00:53 +0000 (15:00 -0700)
# By Alexander Strasser
* as/diff-shortstat-ignore-binary:
diff: Only count lines in show_shortstats

1  2 
diff.c patch | diff1 | diff2 | blob | history
t/t4012-diff-binary.sh patch | diff1 | diff2 | blob | history
diff --cc diff.c
Simple merge
diff --cc t/t4012-diff-binary.sh
Simple merge