Merge branch 'ar/dup-words-fixes'
Typofixes. * ar/dup-words-fixes: *: fix typos which duplicate a word
This commit is contained in:
@ -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
|
||||
|
@ -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,
|
||||
|
Reference in New Issue
Block a user