| commit | 6f82be05191a4ec2adcbcac65078f87900ea8741 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Jun 2010 18:55:38 +0000 (30 11:55 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Jun 2010 18:55:38 +0000 (30 11:55 -0700) | ||
| tree | 26bf74e9fdd311cce2f1d63e3a42af30d30b8edb | treesnapshot (tar.gz zip) |
| parent | a53deac89eb6c65cd953c730f33b86ac3f72d647 | commitdiff |
| parent | 0c72cead8435b2865efc884060bd0bd49313cbd5 | commitdiff |
Merge branch 'jn/grep-open'
* jn/grep-open:
t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script
t/t7811-grep-open.sh: ensure fake "less" is made executable
t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression
grep -O: allow optional argument specifying the pager (or editor)
grep: Add the option '--open-files-in-pager'
Unify code paths of threaded greps
grep: refactor grep_objects loop into its own function
Conflicts:
t/t7006-pager.sh
* jn/grep-open:
t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script
t/t7811-grep-open.sh: ensure fake "less" is made executable
t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression
grep -O: allow optional argument specifying the pager (or editor)
grep: Add the option '--open-files-in-pager'
Unify code paths of threaded greps
grep: refactor grep_objects loop into its own function
Conflicts:
t/t7006-pager.sh
| Documentation/git-grep.txt | diff1 | diff2 | blobhistory |
| builtin/grep.c | diff1 | diff2 | blobhistory |
| t/t7006-pager.sh | diff1 | diff2 | blobhistory |
| t/t7810-grep.sh | diff1 | diff2 | blobhistory |