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>
This commit is contained in:

committed by
Junio C Hamano

parent
dbe33c5ad0
commit
8936352242
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user