summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Jim Meyering <jim@meyering.net>2011-04-13 17:39:40 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-13 11:59:11 -0700
commit0353a0c4ec91cf2d0a8e209025aa2e1909d05f19 (patch)
treed50a8eec64a6785ff37ef49210e539d9c5b1104c /Documentation/git-mergetool.txt
parentrevert: Hide '-r' option in default usage (diff)
downloadtgif-0353a0c4ec91cf2d0a8e209025aa2e1909d05f19.tar.xz
remove doubled words, e.g., s/to to/to/, and fix related typos
I found that some doubled words had snuck back into projects from which I'd already removed them, so now there's a "syntax-check" makefile rule in gnulib to help prevent recurrence. Running the command below spotted a few in git, too: git ls-files | xargs perl -0777 -n \ -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt])\s+\1\b/gims)' \ -e '{$n=($` =~ tr/\n/\n/ + 1); ($v=$&)=~s/\n/\\n/g;' \ -e 'print "$ARGV:$n:$v\n"}' Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions