From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 May 2009 08:38:32 +0000 (-0700)
Subject: Merge branch 'rs/grep-parseopt'
X-Git-Tag: v1.6.4-rc0~143
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=104d3794481c83f8db00ccf85134fc55c76852f9;p=git.git

Merge branch 'rs/grep-parseopt'

* rs/grep-parseopt:
  grep: make callback functions static
  grep: use parseopt
  grep: remove global variable builtin_grep
  parseopt: add PARSE_OPT_NODASH
  parseopt: add OPT_NUMBER_CALLBACK
  parseopt: add OPT_NEGBIT
---

104d3794481c83f8db00ccf85134fc55c76852f9