summaryrefslogtreecommitdiff
path: root/builtin-grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-22 04:08:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-22 04:08:31 (GMT)
commit2d0d706e5fd08b751a19562974ae0b76d9db03a1 (patch)
tree8852a1b2770efa8c69dfe85b6d7ece3d8621d53b /builtin-grep.c
parentb28a1ce04cdafbd3b470ec43c0f562054bd45d4d (diff)
parent19c6a4f8369f37c0df1fb57008a891eb6a6dc4bb (diff)
downloadgit-2d0d706e5fd08b751a19562974ae0b76d9db03a1.zip
git-2d0d706e5fd08b751a19562974ae0b76d9db03a1.tar.gz
git-2d0d706e5fd08b751a19562974ae0b76d9db03a1.tar.bz2
Merge branch 'maint'
* maint: merge-recursive: do not return NULL only to cause segfault retry request without query when info/refs?query fails
Diffstat (limited to 'builtin-grep.c')
0 files changed, 0 insertions, 0 deletions