Merge branch 'jc/1.7.0-diff-whitespace-only-status' into jch
commit9c08420a59385766578eef0e89867318735dc9a6
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2009 06:11:17 +0000 (2 23:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2009 06:11:17 +0000 (2 23:11 -0700)
tree17a284dbbb1a4ca958fa4aeda8a7b32a2d573617
parent38b82fe41a58490fe65d8be8cb93616f1cda833a
parent90b1994170900514a1ce7a3345e25cb7216915cc
Merge branch 'jc/1.7.0-diff-whitespace-only-status' into jch

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