summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2015-02-27 21:01:58 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-27 12:22:41 -0800
commit77fdb8a82cc624bb3c720b87725abae4d0df5073 (patch)
tree454f498ff825971ce1cf41899862142edb50b632 /git-merge-one-file.sh
parentMerge branch 'maint-1.9' into maint-2.0 (diff)
downloadtgif-77fdb8a82cc624bb3c720b87725abae4d0df5073.tar.xz
grep: correct help string for --exclude-standard
The current help string is about --no-exclude-standard. But "git grep -h" would show --exclude-standard instead. Flip the string. See 0a93fb8 (grep: teach --untracked and --exclude-standard options - 2011-09-27) for more info about these options. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions