Skip to content

Commit 5316c8e

Browse files
Thomas Ackermanngitster
authored andcommitted
Documentation/technical: convert plain text files to asciidoc
These were not originally meant for asciidoc, but they are already so close. Mark them up in asciidoc. Signed-off-by: Thomas Ackermann <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 368dc5d commit 5316c8e

File tree

5 files changed

+34
-27
lines changed

5 files changed

+34
-27
lines changed

Documentation/technical/index-format.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GIT index format
22
================
33

4-
= The git index file has the following format
4+
== The git index file has the following format
55

66
All binary numbers are in network byte order. Version 2 is described
77
here unless stated otherwise.

Documentation/technical/pack-format.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GIT pack format
22
===============
33

4-
= pack-*.pack files have the following format:
4+
== pack-*.pack files have the following format:
55

66
- A header appears at the beginning and consists of the following:
77

@@ -34,7 +34,7 @@ GIT pack format
3434

3535
- The trailer records 20-byte SHA1 checksum of all of the above.
3636

37-
= Original (version 1) pack-*.idx files have the following format:
37+
== Original (version 1) pack-*.idx files have the following format:
3838

3939
- The header consists of 256 4-byte network byte order
4040
integers. N-th entry of this table records the number of
@@ -123,8 +123,8 @@ Pack file entry: <+
123123

124124

125125

126-
= Version 2 pack-*.idx files support packs larger than 4 GiB, and
127-
have some other reorganizations. They have the format:
126+
== Version 2 pack-*.idx files support packs larger than 4 GiB, and
127+
have some other reorganizations. They have the format:
128128

129129
- A 4-byte magic number '\377tOc' which is an unreasonable
130130
fanout[0] value.

Documentation/technical/pack-protocol.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ A few things to remember here:
117117
- The repository path is always quoted with single quotes.
118118

119119
Fetching Data From a Server
120-
===========================
120+
---------------------------
121121

122122
When one Git repository wants to get data that a second repository
123123
has, the first can 'fetch' from the second. This operation determines
@@ -134,7 +134,8 @@ with the object name that each reference currently points to.
134134

135135
$ echo -e -n "0039git-upload-pack /schacon/gitbook.git\0host=example.com\0" |
136136
nc -v example.com 9418
137-
00887217a7c7e582c46cec22a130adf4b9d7d950fba0 HEAD\0multi_ack thin-pack side-band side-band-64k ofs-delta shallow no-progress include-tag
137+
00887217a7c7e582c46cec22a130adf4b9d7d950fba0 HEAD\0multi_ack thin-pack
138+
side-band side-band-64k ofs-delta shallow no-progress include-tag
138139
00441d3fcd5ced445d1abc402225c0b8a1299641f497 refs/heads/integration
139140
003f7217a7c7e582c46cec22a130adf4b9d7d950fba0 refs/heads/master
140141
003cb88d2441cac0977faf98efc80305012112238d9d refs/tags/v0.9
@@ -421,7 +422,7 @@ entire packfile without multiplexing.
421422

422423

423424
Pushing Data To a Server
424-
========================
425+
------------------------
425426

426427
Pushing data to a server will invoke the 'receive-pack' process on the
427428
server, which will allow the client to tell it which references it should

Documentation/technical/shallow.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
Def.: Shallow commits do have parents, but not in the shallow
1+
Shallow commits
2+
===============
3+
4+
.Definition
5+
*********************************************************
6+
Shallow commits do have parents, but not in the shallow
27
repo, and therefore grafts are introduced pretending that
38
these commits have no parents.
9+
*********************************************************
410

511
The basic idea is to write the SHA1s of shallow commits into
612
$GIT_DIR/shallow, and handle its contents like the contents

Documentation/technical/trivial-merge.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -74,24 +74,24 @@ For multiple ancestors, a '+' means that this case applies even if
7474
only one ancestor or remote fits; a '^' means all of the ancestors
7575
must be the same.
7676

77-
case ancest head remote result
78-
----------------------------------------
79-
1 (empty)+ (empty) (empty) (empty)
80-
2ALT (empty)+ *empty* remote remote
81-
2 (empty)^ (empty) remote no merge
82-
3ALT (empty)+ head *empty* head
83-
3 (empty)^ head (empty) no merge
84-
4 (empty)^ head remote no merge
85-
5ALT * head head head
86-
6 ancest+ (empty) (empty) no merge
87-
8 ancest^ (empty) ancest no merge
88-
7 ancest+ (empty) remote no merge
89-
10 ancest^ ancest (empty) no merge
90-
9 ancest+ head (empty) no merge
91-
16 anc1/anc2 anc1 anc2 no merge
92-
13 ancest+ head ancest head
93-
14 ancest+ ancest remote remote
94-
11 ancest+ head remote no merge
77+
case ancest head remote result
78+
----------------------------------------
79+
1 (empty)+ (empty) (empty) (empty)
80+
2ALT (empty)+ *empty* remote remote
81+
2 (empty)^ (empty) remote no merge
82+
3ALT (empty)+ head *empty* head
83+
3 (empty)^ head (empty) no merge
84+
4 (empty)^ head remote no merge
85+
5ALT * head head head
86+
6 ancest+ (empty) (empty) no merge
87+
8 ancest^ (empty) ancest no merge
88+
7 ancest+ (empty) remote no merge
89+
10 ancest^ ancest (empty) no merge
90+
9 ancest+ head (empty) no merge
91+
16 anc1/anc2 anc1 anc2 no merge
92+
13 ancest+ head ancest head
93+
14 ancest+ ancest remote remote
94+
11 ancest+ head remote no merge
9595

9696
Only #2ALT and #3ALT use *empty*, because these are the only cases
9797
where there can be conflicts that didn't exist before. Note that we

0 commit comments

Comments
 (0)