summaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-02-27 13:57:15 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-02-27 13:57:16 -0800
commit036465a248df7b0876e65d0e137826203305c606 (patch)
tree084260f918cbf2b84af05d1b92647705f0d2da36 /builtin/merge-base.c
parentMerge branch 'dt/gc-ignore-old-gc-logs' (diff)
parentgrep: treat revs the same for --untracked as for --no-index (diff)
downloadtgif-036465a248df7b0876e65d0e137826203305c606.tar.xz
Merge branch 'jk/grep-no-index-fix'
The code to parse the command line "git grep <patterns>... <rev> [[--] <pathspec>...]" 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
Diffstat (limited to 'builtin/merge-base.c')
0 files changed, 0 insertions, 0 deletions