Merge branch 'js/diffstat' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 16 Apr 2006 02:35:55 +0000 (19:35 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 16 Apr 2006 02:35:55 +0000 (19:35 -0700)
commit07512ea820b9161a1f45bb1bcc1bd67d6e1ea74f
treed228eb5f456bd1f5bdae368b223de55038c028f6
parent6db4ac3453973bde287c363685af48d9eabbf9da
parent293532739415d287786a312ec10849723383796e
Merge branch 'js/diffstat' into next

* js/diffstat:
  diff-options: add --patch-with-stat
  diff-files --stat: do not dump core with unmerged index.
  Support "git cmd --help" syntax
  diff --stat: do not do its own three-dashes.
git.c