Merge branch 'jc/diff-whitespace-only-status' into next
commita95ef78275a28fbe142e99bfbd89e761e04fb3e8
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Jul 2009 18:53:57 +0000 (13 11:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Jul 2009 18:53:57 +0000 (13 11:53 -0700)
tree80d886c82740ea7d35de10e4357bbf7de62a769e
parent1a0249ea145a62fc5af2f01c9e8a87fca7fd9244
parentfcea4593b6f18370c14de3d7cc5e91c1608dd965
Merge branch 'jc/diff-whitespace-only-status' into next

* jc/diff-whitespace-only-status:
  diff: Rename QUIET internal option to QUICK
  diff: change semantics of "ignore whitespace" options
builtin-log.c
builtin-rev-list.c
diff-lib.c
diff.c
revision.c
tree-diff.c