Code

Merge branch 'rs/diff-no-minimal' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:38:50 +0000 (05:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:38:50 +0000 (05:38 -0700)
commit60335534a6ac52d4d3a372a5b56df5a57a4463d1
tree8d61494762039a2268c3116574841fe71181054b
parente1ba0f6340c1d72677c7792a0a82ecf05363026e
parent582aa00bdffb27abcf1b27d541b4c231a395d3b8
Merge branch 'rs/diff-no-minimal' into maint

* rs/diff-no-minimal:
  git diff too slow for a file
builtin/blame.c
builtin/merge-file.c
builtin/merge-tree.c
builtin/rerere.c
combine-diff.c
diff.c
merge-file.c