Merge branch 'jc/grep' into next

diff --git a/git.c b/git.c
index a8f7926b4875512b1d93768c1bc6d934111954f6..84803a62e6c4dc6b64aaf5d1fda9991be535048a 100644 (file)
--- a/git.c
+++ b/git.c
@@ -50,6 +50,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "fmt-patch", cmd_format_patch },
                { "count-objects", cmd_count_objects },
                { "diff", cmd_diff },
+               { "grep", cmd_grep },
        };
        int i;