doc: *.txt -> *.adoc fixes
Update a few more instances of Documentation/*.txt files which have been renamed to *.adoc. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
59d9280908
commit
97350e18e2
@ -513,7 +513,7 @@ If the filter command (a string value) is defined via
|
|||||||
`filter.<driver>.process` then Git can process all blobs with a
|
`filter.<driver>.process` then Git can process all blobs with a
|
||||||
single filter invocation for the entire life of a single Git
|
single filter invocation for the entire life of a single Git
|
||||||
command. This is achieved by using the long-running process protocol
|
command. This is achieved by using the long-running process protocol
|
||||||
(described in technical/long-running-process-protocol.txt).
|
(described in Documentation/technical/long-running-process-protocol.adoc).
|
||||||
|
|
||||||
When Git encounters the first file that needs to be cleaned or smudged,
|
When Git encounters the first file that needs to be cleaned or smudged,
|
||||||
it starts the filter and performs the handshake. In the handshake, the
|
it starts the filter and performs the handshake. In the handshake, the
|
||||||
@ -1177,11 +1177,11 @@ integer has a meaningful effect.
|
|||||||
|
|
||||||
For example, this line in `.gitattributes` can be used to tell the merge
|
For example, this line in `.gitattributes` can be used to tell the merge
|
||||||
machinery to leave much longer (instead of the usual 7-character-long)
|
machinery to leave much longer (instead of the usual 7-character-long)
|
||||||
conflict markers when merging the file `Documentation/git-merge.txt`
|
conflict markers when merging the file `Documentation/git-merge.adoc`
|
||||||
results in a conflict.
|
results in a conflict.
|
||||||
|
|
||||||
------------------------
|
------------------------
|
||||||
Documentation/git-merge.txt conflict-marker-size=32
|
Documentation/git-merge.adoc conflict-marker-size=32
|
||||||
------------------------
|
------------------------
|
||||||
|
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ Comparison with sub-process model
|
|||||||
---------------------------------
|
---------------------------------
|
||||||
|
|
||||||
The Simple-IPC mechanism differs from the existing `sub-process.c`
|
The Simple-IPC mechanism differs from the existing `sub-process.c`
|
||||||
model (Documentation/technical/long-running-process-protocol.txt) and
|
model (Documentation/technical/long-running-process-protocol.adoc) and
|
||||||
used by applications like Git-LFS. In the LFS-style sub-process model,
|
used by applications like Git-LFS. In the LFS-style sub-process model,
|
||||||
the helper is started by the foreground process, communication happens
|
the helper is started by the foreground process, communication happens
|
||||||
via a pair of file descriptors bound to the stdin/stdout of the
|
via a pair of file descriptors bound to the stdin/stdout of the
|
||||||
|
@ -394,7 +394,7 @@ inflated again in step 3, for a total of two inflations.
|
|||||||
|
|
||||||
Step 4 is probably necessary for good read-time performance. "git
|
Step 4 is probably necessary for good read-time performance. "git
|
||||||
pack-objects" on the server optimizes the pack file for good data
|
pack-objects" on the server optimizes the pack file for good data
|
||||||
locality (see Documentation/technical/pack-heuristics.txt).
|
locality (see Documentation/technical/pack-heuristics.adoc).
|
||||||
|
|
||||||
Details of this process are likely to change. It will take some
|
Details of this process are likely to change. It will take some
|
||||||
experimenting to get this to perform well.
|
experimenting to get this to perform well.
|
||||||
|
Reference in New Issue
Block a user