Skip to content

Commit 07de2fd

Browse files
kianmengjpgrayson
authored andcommitted
docs: fix typos
Found via `codespell -S t -L crate,isnt,toke,swith`
1 parent d6e146c commit 07de2fd

File tree

16 files changed

+26
-26
lines changed

16 files changed

+26
-26
lines changed

CHANGELOG.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
`$XDG_CONFIG_HOME/stgit/templates/` and `$HOME/.stgit/templates`. This
108108
search strategy is consistent with how git looks for the global config
109109
file.
110-
- The new `--signoff` patch edit option supercedes the deprecated
110+
- The new `--signoff` patch edit option supersedes the deprecated
111111
`--sign` and `--sign-by` options. `--signoff` without its optional
112112
value does the same thing as `--sign`, while `--signoff=<value>` does
113113
the same thing as `--sign-by=<value>`.
@@ -178,7 +178,7 @@
178178
- Avoid case insensitive patch name collisions. On operating systems
179179
with case-insensitive paths, patch names that only differ by case lead
180180
to patch reference collisions. StGit now ensures that patch names are
181-
distinct under case insensitive comparisions.
181+
distinct under case insensitive comparisons.
182182
- `stg pull` and `stg rebase` record updated stack state instead of
183183
deferring until the next stack-modifying command to do so.
184184

@@ -213,7 +213,7 @@
213213
- Repair check for modifications to stack by external tools.
214214
- `stg pull` and `stg rebase` record updated stack state instead of
215215
deferring until the next stack-modifying command to do so.
216-
- Improve patch appliction with `git apply --3way` when pushing` (#225)
216+
- Improve patch application with `git apply --3way` when pushing` (#225)
217217
- Zsh completion for `--diff-opt` accommodates multiple occurrences
218218

219219

@@ -340,7 +340,7 @@
340340
- Bash completions for shell aliases now fallback to filename
341341
completions (#191).
342342
- Help options listings now ensure --color and --help are shown last.
343-
- Various zsh completion improvments:
343+
- Various zsh completion improvements:
344344
- Add descriptions for --color values
345345
- Complete -O/--diff-opts values (using `git diff-tree --git-completion-helper`)
346346
- Comprehend `stg -C <dir>` options
@@ -399,7 +399,7 @@
399399
- Avoid case insensitive patch name collisions. On operating systems
400400
with case-insensitive paths, patch names that only differ by case lead
401401
to patch reference collisions. StGit now ensures that patch names are
402-
distinct under case insensitive comparisions.
402+
distinct under case insensitive comparisons.
403403
- Add missing `-t` short option for `--set-tree` for `stg edit`.
404404
- Add missing `-k` short option for `--keep`.
405405

@@ -486,7 +486,7 @@
486486
- `stg show` diff can now be limited to certain paths by specifying path
487487
limits on the command line.
488488
- `stg show` diff output respects the `--color` option.
489-
- The new `--signoff` patch edit option supercedes the deprecated
489+
- The new `--signoff` patch edit option supersedes the deprecated
490490
`--sign` and `--sign-by` options. `--signoff` without its optional
491491
value does the same thing as `--sign`, while `--signoff=<value>` does
492492
the same thing as `--sign-by=<value>`.
@@ -827,7 +827,7 @@
827827
- `stg diff --range` detects some invalid values (e.g. `-r ..`).
828828
- Date parsing is now more portable, only use platform specific `date`
829829
as last parsing option. Affects, e.g., `stg refresh --authdate`.
830-
- Repaired seach path for templates to avoid looking in Python
830+
- Repaired search path for templates to avoid looking in Python
831831
site-packages directory.
832832
- Ensure stdout and stderr are flushed. Rarely affected `stg diff`.
833833
- `stg repair` will now fail if extra command line arguments are

completion/stgit.zsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ _stg-import() {
705705
'(-p --strip)'{-p+,--strip=}'[remove N leading directories from diff paths]:num'
706706
'(-t --stripname)'{-t,--stripname}'[strip number and extension from patch name]'
707707
'-C=[ensure N lines of surrounding context for each change]:num'
708-
'(-i --ignore)'{-i,--ignore}'[ingore applied patches in series]'
708+
'(-i --ignore)'{-i,--ignore}'[ignore applied patches in series]'
709709
'--replace[replace unapplied patches in series]'
710710
'--reject[leave rejected hunks in .rej files]'
711711
'--keep-cr[do not remove CR from email lines ending with CRLF]'

contrib/stg-cvs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ set -e
2929
# LIMITATIONS
3030
# - this is only a proof-of-concept prototype
3131
# - lacks an "init" command (see above)
32-
# - "commit" does not ensure the base is uptodate before trying to
32+
# - "commit" does not ensure the base is up-to-date before trying to
3333
# commit (but hey, it's CVS ;): better "stg-cvs pull" first
3434
# - "commit" can only commit a single patch
3535
# - not much robustness here

contrib/stg-gitk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ elif grep -q -- --argscmd "$(command -v gitk)"; then
9191
gitk --argscmd="$0 --refs $branches" "$@"
9292
fi
9393
else
94-
# This gitk does not support --argscmd, just compute refs onces
94+
# This gitk does not support --argscmd, just compute refs once
9595
# shellcheck disable=SC2046
9696
gitk $(printrefs) "$@"
9797
fi

contrib/stg-show

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -e
1111

1212
command=(git show)
1313

14-
# subsitute git id's for stg ones until --
14+
# substitute git id's for stg ones until --
1515
while [ "$#" -gt 0 ]; do
1616
case "$1" in
1717
--) break ;;

examples/gitconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
#rebasecmd = git reset
5353

5454
# "stg pull" policy. This is the repository default, which can be
55-
# overriden on a per-branch basis using branch.*.stgit.pull-policy
55+
# overridden on a per-branch basis using branch.*.stgit.pull-policy
5656
# By default:
5757
#pull-policy = pull
5858
# To support remote rewinding parent branches:

src/cmd/email/format.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ fn format_options() -> Vec<Arg> {
142142
'--reroll-count=4.4', or '--reroll-count=4rev2' are allowed), but the \
143143
downside of using such a reroll-count is that the \
144144
range-diff/interdiff with the previous version does not state exactly \
145-
which version the new interation is compared against.",
145+
which version the new iteration is compared against.",
146146
)
147147
.value_name("n")
148148
.num_args(1),

src/cmd/pick.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fn make() -> clap::Command {
4141
'--revert' option.\n\
4242
\n\
4343
When using the '--expose' option, the format of the commit message is \
44-
determinded by the 'stgit.pick.expose-format' configuration option. This \
44+
determined by the 'stgit.pick.expose-format' configuration option. This \
4545
option is a format string as may be supplied to the '--pretty' option of \
4646
'git show'. The default is \"format:%B%n(imported from commit %H)\", \
4747
which appends the commit hash of the picked commit to the patch's commit \

src/cmd/refresh.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fn make() -> clap::Command {
4343
Refresh will warn if the index is dirty, and require use of \
4444
either the '--index' or '--force' options to override this \
4545
check. This is to prevent accidental full refresh when only \
46-
some changes were staged using git add interative mode.\n\
46+
some changes were staged using git add interactive mode.\n\
4747
\n\
4848
You may optionally list one or more files or directories \
4949
relative to the current working directory; if you do, only \

src/cmd/uncommit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fn make() -> clap::Command {
5353
)
5454
.arg(
5555
Arg::new("patchname")
56-
.help("Patch names for the uncommited commits")
56+
.help("Patch names for the uncommitted commits")
5757
.num_args(1..)
5858
.value_parser(clap::value_parser!(PatchName)),
5959
)

0 commit comments

Comments
 (0)