summaryrefslogtreecommitdiff
path: root/builtin/grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-27 18:45:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-27 18:45:41 (GMT)
commit523f0a25b91c34ec817bc5757f52f365f497e3bb (patch)
tree09d5b98d64030b0e7f97c2e5536b466adcfa4c32 /builtin/grep.c
parent33d4669aaa658f3e35f88748ed2db51c84203f62 (diff)
parentf84cb684634f50df7adde7f52c25f049d257f0e3 (diff)
downloadgit-523f0a25b91c34ec817bc5757f52f365f497e3bb.zip
git-523f0a25b91c34ec817bc5757f52f365f497e3bb.tar.gz
git-523f0a25b91c34ec817bc5757f52f365f497e3bb.tar.bz2
Merge branch 'pw/git-p4'
Various "git p4" updates. * pw/git-p4: git p4 doc: use two-line style for options with multiple spellings git p4 test: examine behavior with locked (+l) files git p4: fix an error message when "p4 where" fails git p4: handle files with wildcards when doing RCS scrubbing git p4 test: do not pollute /tmp git p4 test: run as user "author" git p4 test: is_cli_file_writeable succeeds git p4 test: explicitly check p4 wildcard delete git p4: work around p4 bug that causes empty symlinks git p4 test: ensure p4 symlink parsing works git p4 test: wildcards are supported
Diffstat (limited to 'builtin/grep.c')
0 files changed, 0 insertions, 0 deletions