summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-30 11:55:38 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-30 11:55:38 -0700
commit6f82be05191a4ec2adcbcac65078f87900ea8741 (patch)
tree26bf74e9fdd311cce2f1d63e3a42af30d30b8edb /git.c
parenta53deac89eb6c65cd953c730f33b86ac3f72d647 (diff)
parent0c72cead8435b2865efc884060bd0bd49313cbd5 (diff)
downloadgit-6f82be05191a4ec2adcbcac65078f87900ea8741.tar.xz
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
Diffstat (limited to 'git.c')
-rw-r--r--git.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/git.c b/git.c
index 99f036302a..265fa09d8d 100644
--- a/git.c
+++ b/git.c
@@ -329,7 +329,7 @@ static void handle_internal_command(int argc, const char **argv)
{ "fsck-objects", cmd_fsck, RUN_SETUP },
{ "gc", cmd_gc, RUN_SETUP },
{ "get-tar-commit-id", cmd_get_tar_commit_id },
- { "grep", cmd_grep, USE_PAGER },
+ { "grep", cmd_grep },
{ "hash-object", cmd_hash_object },
{ "help", cmd_help },
{ "index-pack", cmd_index_pack },