Skip to content

Commit 65c2b2b

Browse files
meyeringgitster
authored andcommitted
correct a few doubled-word nits in comments and documentation
Found by running this command: $ git ls-files -z|xargs -0 perl -0777 -n \ -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt]o)\s+\1\b/gims)' \ -e ' {' \ -e ' $n = ($` =~ tr/\n/\n/ + 1);' \ -e ' ($v = $&) =~ s/\n/\\n/g;' \ -e ' print "$ARGV:$n:$v\n";' \ -e ' }' Why not just git grep -E ...? That wouldn't work then the doubled words are separated by a newline. This is derived from a Makefile syntax-check rule in gnulib's maint.mk: http://git.sv.gnu.org/cgit/gnulib.git/tree/top/maint.mk Signed-off-by: Jim Meyering <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a7793a7 commit 65c2b2b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Documentation/git-sh-i18n--envsubst.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ plumbing scripts and/or are writing new ones.
2525
'git sh-i18n{litdd}envsubst' is Git's stripped-down copy of the GNU
2626
`envsubst(1)` program that comes with the GNU gettext package. It's
2727
used internally by linkgit:git-sh-i18n[1] to interpolate the variables
28-
passed to the the `eval_gettext` function.
28+
passed to the `eval_gettext` function.
2929

3030
No promises are made about the interface, or that this
3131
program won't disappear without warning in the next version

attr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ int git_check_attr(const char *path, int, struct git_attr_check *);
4040

4141
/*
4242
* Retrieve all attributes that apply to the specified path. *num
43-
* will be set the the number of attributes on the path; **check will
43+
* will be set to the number of attributes on the path; **check will
4444
* be set to point at a newly-allocated array of git_attr_check
4545
* objects describing the attributes and their values. *check must be
4646
* free()ed by the caller.

gitweb/static/js/lib/cookies.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* If a negative value is specified or a date in the past),
3131
* the cookie will be deleted.
3232
* If set to null or omitted, the cookie will be a session cookie
33-
* and will not be retained when the the browser exits.
33+
* and will not be retained when the browser exits.
3434
* @param {String} [options.path] Restrict access of a cookie to particular directory
3535
* (default: path of page that created the cookie).
3636
* @param {String} [options.domain] Override what web sites are allowed to access cookie

po/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ used:
178178

179179
C:
180180

181-
- Include builtin.h at the top, it'll pull in in gettext.h, which
181+
- Include builtin.h at the top, it'll pull in gettext.h, which
182182
defines the gettext interface. Consult with the list if you need to
183183
use gettext.h directly.
184184

0 commit comments

Comments
 (0)