Merge branch 'jk/diff-no-index-pager' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2012 19:46:21 +0000 (12:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2012 19:46:21 +0000 (12:46 -0700)
commit95c9eb8fcd4c9a72954c9d16b0d4c653a1f02085
tree312bc55583092c4db0ce3e2634b58b1029a36f35
parent9ca724933a8d50633699acf3e5731fa392e2ff36
parentaf63b543ed9f7d606cdd2c7a3bcded4e2dc8dad4
Merge branch 'jk/diff-no-index-pager' into maint

"git diff --no-index" did not work with pagers correctly.

* jk/diff-no-index-pager:
  do not run pager with diff --no-index --quiet
  fix pager.diff with diff --no-index
builtin.h