Merge branch 'tr/maint-no-index-fixes' into maint
commitf630171d9d1839669446506aff0704a4dfe98b99
authorJunio C Hamano <gitster@pobox.com>
Sat, 24 Jan 2009 03:04:48 +0000 (23 19:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 24 Jan 2009 03:04:48 +0000 (23 19:04 -0800)
tree6fbf9fbff5cdf5b1ad1df6147090ce5f131a543c
parent46cdcc627522b83bbf1d60fb3bf703b88d237dc0
parenta324fc45e4d04e3b879cd2d9a603d73ca696b775
Merge branch 'tr/maint-no-index-fixes' into maint

* tr/maint-no-index-fixes:
  diff --no-index -q: fix endless loop
  diff --no-index: test for pager after option parsing
  diff: accept -- when using --no-index