From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Sep 2007 22:17:07 +0000 (-0700)
Subject: Merge branch 'jc/grep-c'
X-Git-Tag: v1.5.4-rc0~444
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f6336167e9f233d3a68c8ded18b172ba50cde743;p=git.git

Merge branch 'jc/grep-c'

* jc/grep-c:
  Split grep arguments in a way that does not requires to add /dev/null.
  Documentation/git-config.txt: AsciiDoc tweak to avoid leading dot
  Add test to check recent fix to "git add -u"
  Documentation/git-archive.txt: a couple of clarifications.
  Fix the rename detection limit checking
  diff --no-index: do not forget to run diff_setup_done()
---

f6336167e9f233d3a68c8ded18b172ba50cde743