Code

Merge branch 'jh/dirstat' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 21:59:07 +0000 (14:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 21:59:07 +0000 (14:59 -0700)
commitf5bf1b5f6b43f5ed9263f4cecd0faf58c5a7322f
tree974ffecbcfaa90e90a2d72ee98bcc11cf694723f
parent419272d87b7a611ea55736c284df9615d22ec6af
parent2ca86714703f81f9dd5dfb31f8d97a8a0089634d
Merge branch 'jh/dirstat' into maint

* jh/dirstat:
  --dirstat: In case of renames, use target filename instead of source filename
  Teach --dirstat not to completely ignore rearranged lines within a file
  --dirstat-by-file: Make it faster and more correct
  --dirstat: Describe non-obvious differences relative to --stat or regular diff
diff.c