From: Junio C Hamano Date: Mon, 27 Feb 2017 21:57:15 +0000 (-0800) Subject: Merge branch 'jk/grep-no-index-fix' X-Git-Tag: v2.13.0-rc0~163 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/036465a248df7b0876e65d0e137826203305c606?ds=inline;hp=--cc Merge branch 'jk/grep-no-index-fix' The code to parse the command line "git grep ... [[--] ...]" has been cleaned up, and a handful of bugs have been fixed (e.g. we used to check "--" if it is a rev). * jk/grep-no-index-fix: grep: treat revs the same for --untracked as for --no-index grep: do not diagnose misspelt revs with --no-index grep: avoid resolving revision names in --no-index case grep: fix "--" rev/pathspec disambiguation grep: re-order rev-parsing loop grep: do not unnecessarily query repo for "--" grep: move thread initialization a little lower --- 036465a248df7b0876e65d0e137826203305c606