diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-16 12:07:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-16 12:07:47 -0800 |
| commit | 3ed618f28fc14d38cebe9167b0beece519e7ef80 (patch) | |
| tree | 42f71697e54db899f53a77f68e573201afd3f4ed /builtin | |
| parent | ffd923868574a004ec20a80dbc3b813da9a93b08 (diff) | |
| parent | b39a84185e79cff69f9f1f79f1edb014ef27b9c6 (diff) | |
Merge branch 'ar/dup-words-fixes'
Typofixes.
* ar/dup-words-fixes:
*: fix typos which duplicate a word
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/checkout.c | 2 | ||||
| -rw-r--r-- | builtin/submodule--helper.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index cd04f0bf57..5963e1b74b 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1270,7 +1270,7 @@ static int parse_branchname_arg(int argc, const char **argv, * between A and B, A...B names that merge base. * * (b) If <something> is _not_ a commit, either "--" is present - * or <something> is not a path, no -t or -b was given, and + * or <something> is not a path, no -t or -b was given, * and there is a tracking branch whose name is <something> * in one and only one remote (or if the branch exists on the * remote named in checkout.defaultRemote), then this is a diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 450680fc70..4c173d8b37 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -3219,9 +3219,8 @@ static void die_on_index_match(const char *path, int force) ensure_full_index(&the_index); /* - * Since there is only one pathspec, we just need - * need to check ps_matched[0] to know if a cache - * entry matched. + * Since there is only one pathspec, we just need to + * check ps_matched[0] to know if a cache entry matched. */ for (i = 0; i < the_index.cache_nr; i++) { ce_path_match(&the_index, the_index.cache[i], &ps, |