diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:07 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:29 -0700 |
| commit | 89363522424a27b2e43c74a7965566d943cbdba4 (patch) | |
| tree | b57dd5a4a5c4739869652d981e19ed557238f629 /Documentation/technical | |
| parent | dbe33c5ad02aa9a6141abccf0821b49c46df2891 (diff) | |
| download | git-89363522424a27b2e43c74a7965566d943cbdba4.tar.gz | |
documentation: add missing words
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical')
| -rw-r--r-- | Documentation/technical/api-simple-ipc.txt | 2 | ||||
| -rw-r--r-- | Documentation/technical/partial-clone.txt | 2 | ||||
| -rw-r--r-- | Documentation/technical/racy-git.txt | 2 | ||||
| -rw-r--r-- | Documentation/technical/rerere.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/technical/api-simple-ipc.txt b/Documentation/technical/api-simple-ipc.txt index 6c127b5ddd..d88b1ef206 100644 --- a/Documentation/technical/api-simple-ipc.txt +++ b/Documentation/technical/api-simple-ipc.txt @@ -20,7 +20,7 @@ IPC-client. The IPC-client routines within a client application process connect to the IPC-server and send a request message and wait for a response. -When received, the response is returned back the caller. +When received, the response is returned back to the caller. For example, the `fsmonitor--daemon` feature will be built as a server application on top of the IPC-server library routines. It will have diff --git a/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.txt index b01cff6912..1719c723f5 100644 --- a/Documentation/technical/partial-clone.txt +++ b/Documentation/technical/partial-clone.txt @@ -3,7 +3,7 @@ Partial Clone Design Notes The "Partial Clone" feature is a performance optimization for Git that allows Git to function without having a complete copy of the repository. -The goal of this work is to allow Git better handle extremely large +The goal of this work is to allow Git to better handle extremely large repositories. During clone and fetch operations, Git downloads the complete contents diff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt index 783e87e6aa..02ae508d22 100644 --- a/Documentation/technical/racy-git.txt +++ b/Documentation/technical/racy-git.txt @@ -11,7 +11,7 @@ write out the next tree object to be committed. The state is "virtual" in the sense that it does not necessarily have to, and often does not, match the files in the working tree. -There are cases Git needs to examine the differences between the +There are cases where Git needs to examine the differences between the virtual working tree state in the index and the files in the working tree. The most obvious case is when the user asks `git diff` (or its low level implementation, `git diff-files`) or diff --git a/Documentation/technical/rerere.txt b/Documentation/technical/rerere.txt index 3f9259cb1e..5f4dd7c102 100644 --- a/Documentation/technical/rerere.txt +++ b/Documentation/technical/rerere.txt @@ -60,7 +60,7 @@ By resolving this conflict, to leave line D, the user declares: what AB and AC wanted to do. As branch AC2 refers to the same commit as AC, the above implies that -this is also compatible what AB and AC2 wanted to do. +this is also compatible with what AB and AC2 wanted to do. By extension, this means that rerere should recognize that the above conflicts are the same. To do this, the labels on the conflict |