summaryrefslogtreecommitdiff
path: root/builtin/replace.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-15 20:26:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-15 20:26:52 -0700
commit9fddaf78964a835160a0b27cdac724c27aab09bf (patch)
treebc7d01f3fc383385b11f8931beaf2a114eab9620 /builtin/replace.c
parentMerge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude (diff)
parentgrep: fix the error message that mentions --exclude (diff)
downloadtgif-9fddaf78964a835160a0b27cdac724c27aab09bf.tar.xz
Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude
* jc/maint-grep-untracked-exclude: grep: fix the error message that mentions --exclude Conflicts: builtin/grep.c
Diffstat (limited to 'builtin/replace.c')
0 files changed, 0 insertions, 0 deletions