diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-24 12:57:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-24 12:57:53 -0700 |
| commit | ea7aa5a464ea7e0d5ee5f3c2a5728d40ebd1f3f1 (patch) | |
| tree | c233aa4899ff2b883a4da45bce8fecb89f198636 /t/t3310-notes-merge-manual-resolve.sh | |
| parent | Merge branch 'jn/remote-helpers-with-git-dir' into maint (diff) | |
| parent | grep: treat revs the same for --untracked as for --no-index (diff) | |
| download | tgif-ea7aa5a464ea7e0d5ee5f3c2a5728d40ebd1f3f1.tar.xz | |
Merge branch 'jk/grep-no-index-fix' into maint
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 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions