mirror of
https://github.com/git/git.git
synced 2024-05-09 21:56:07 +02:00
remove repeat word
This commit is contained in:
parent
9d530dc002
commit
586d02166b
|
@ -574,7 +574,7 @@ Writing Documentation:
|
|||
avoidance of gendered pronouns.
|
||||
|
||||
- When it becomes awkward to stick to this style, prefer "you" when
|
||||
addressing the the hypothetical user, and possibly "we" when
|
||||
addressing the hypothetical user, and possibly "we" when
|
||||
discussing how the program might react to the user. E.g.
|
||||
|
||||
You can use this option instead of --xyz, but we might remove
|
||||
|
|
|
@ -42,7 +42,7 @@ BUNDLE FORMAT
|
|||
Bundles are `.pack` files (see linkgit:git-pack-objects[1]) with a
|
||||
header indicating what references are contained within the bundle.
|
||||
|
||||
Like the the packed archive format itself bundles can either be
|
||||
Like the packed archive format itself bundles can either be
|
||||
self-contained, or be created using exclusions.
|
||||
See the "OBJECT PREREQUISITES" section below.
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ Outline:
|
|||
3. Why any rename on MERGE_SIDE1 in any given pick is _almost_ always also
|
||||
a rename on MERGE_SIDE1 for the next pick
|
||||
|
||||
4. A detailed description of the the counter-examples to #3.
|
||||
4. A detailed description of the counter-examples to #3.
|
||||
|
||||
5. Why the special cases in #4 are still fully reasonable to use to pair
|
||||
up files for three-way content merging in the merge machinery, and why
|
||||
|
|
|
@ -332,7 +332,7 @@ static void write_file_in_directory(struct strbuf *dir, size_t dir_len,
|
|||
/* Write the file contents for the left and right sides of the difftool
|
||||
* dir-diff representation for submodules and symlinks. Symlinks and submodules
|
||||
* are written as regular text files so that external diff tools can diff them
|
||||
* as text files, resulting in behavior that is analogous to to what "git diff"
|
||||
* as text files, resulting in behavior that is analogous to what "git diff"
|
||||
* displays for symlink and submodule diffs.
|
||||
*/
|
||||
static void write_standin_files(struct pair_entry *entry,
|
||||
|
|
|
@ -47,7 +47,7 @@ void oidtree_insert(struct oidtree *ot, const struct object_id *oid)
|
|||
|
||||
/*
|
||||
* n.b. Current callers won't get us duplicates, here. If a
|
||||
* future caller causes duplicates, there'll be a a small leak
|
||||
* future caller causes duplicates, there'll be a small leak
|
||||
* that won't be freed until oidtree_clear. Currently it's not
|
||||
* worth maintaining a free list
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue