]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dddc411 f01cae9)
Merge branch 'jc/maint-diffstat-numstat-context' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 23:10:56 +0000 (16:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 23:10:56 +0000 (16:10 -0700)
* jc/maint-diffstat-numstat-context:
  diff: teach --stat/--numstat to honor -U$num

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

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