From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Jan 2009 07:05:38 +0000 (-0800)
Subject: Merge branch 'tr/maint-no-index-fixes'
X-Git-Tag: v1.6.2-rc0~139
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=33256e6b1bfb597f6505a7f40554097035c9ab60;p=git.git

Merge branch 'tr/maint-no-index-fixes'

* 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
---

33256e6b1bfb597f6505a7f40554097035c9ab60