Skip to content

Commit 3b70d3c

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.6.5.3-298-g39add
1 parent a557446 commit 3b70d3c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2875
-481
lines changed

‎cmds-mainporcelain.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ linkgit:git-merge[1]::
6767
linkgit:git-mv[1]::
6868
Move or rename a file, a directory, or a symlink.
6969

70+
linkgit:git-notes[1]::
71+
Add/inspect commit notes.
72+
7073
linkgit:git-pull[1]::
7174
Fetch from and merge with another repository or a local branch.
7275

‎config.txt‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,9 +387,7 @@ core.editor::
387387
Commands such as `commit` and `tag` that lets you edit
388388
messages by launching an editor uses the value of this
389389
variable when it is set, and the environment variable
390-
`GIT_EDITOR` is not set. The order of preference is
391-
`GIT_EDITOR` environment, `core.editor`, `VISUAL` and
392-
`EDITOR` environment variables and then finally `vi`.
390+
`GIT_EDITOR` is not set. See linkgit:git-var[1].
393391

394392
core.pager::
395393
The command that git will use to paginate output. Can
@@ -458,6 +456,19 @@ On some file system/operating system combinations, this is unreliable.
458456
Set this config setting to 'rename' there; However, This will remove the
459457
check that makes sure that existing object files will not get overwritten.
460458

459+
core.notesRef::
460+
When showing commit messages, also show notes which are stored in
461+
the given ref. This ref is expected to contain files named
462+
after the full SHA-1 of the commit they annotate.
463+
+
464+
If such a file exists in the given ref, the referenced blob is read, and
465+
appended to the commit message, separated by a "Notes:" line. If the
466+
given ref itself does not exist, it is not an error, but means that no
467+
notes should be printed.
468+
+
469+
This setting defaults to "refs/notes/commits", and can be overridden by
470+
the `GIT_NOTES_REF` environment variable.
471+
461472
add.ignore-errors::
462473
Tells 'git-add' to continue adding files when some files cannot be
463474
added due to indexing errors. Equivalent to the '--ignore-errors'
@@ -1093,6 +1104,14 @@ http.maxRequests::
10931104
How many HTTP requests to launch in parallel. Can be overridden
10941105
by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5.
10951106

1107+
http.postBuffer::
1108+
Maximum size in bytes of the buffer used by smart HTTP
1109+
transports when POSTing data to the remote system.
1110+
For requests larger than this buffer size, HTTP/1.1 and
1111+
Transfer-Encoding: chunked is used to avoid creating a
1112+
massive pack file locally. Default is 1 MiB, which is
1113+
sufficient for most requests.
1114+
10961115
http.lowSpeedLimit, http.lowSpeedTime::
10971116
If the HTTP transfer speed is less than 'http.lowSpeedLimit'
10981117
for longer than 'http.lowSpeedTime' seconds, the transfer is aborted.

‎diff-options.txt‎

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ endif::git-format-patch[]
1414

1515
ifdef::git-format-patch[]
1616
-p::
17-
Generate patches without diffstat.
17+
--no-stat::
18+
Generate plain patches without any diffstats.
1819
endif::git-format-patch[]
1920

2021
ifndef::git-format-patch[]
@@ -27,58 +28,67 @@ endif::git-format-patch[]
2728
-U<n>::
2829
--unified=<n>::
2930
Generate diffs with <n> lines of context instead of
30-
the usual three. Implies "-p".
31+
the usual three.
32+
ifndef::git-format-patch[]
33+
Implies `-p`.
34+
endif::git-format-patch[]
3135

36+
ifndef::git-format-patch[]
3237
--raw::
3338
Generate the raw format.
3439
{git-diff-core? This is the default.}
40+
endif::git-format-patch[]
3541

42+
ifndef::git-format-patch[]
3643
--patch-with-raw::
37-
Synonym for "-p --raw".
44+
Synonym for `-p --raw`.
45+
endif::git-format-patch[]
3846

3947
--patience::
4048
Generate a diff using the "patience diff" algorithm.
4149

4250
--stat[=width[,name-width]]::
4351
Generate a diffstat. You can override the default
44-
output width for 80-column terminal by "--stat=width".
52+
output width for 80-column terminal by `--stat=width`.
4553
The width of the filename part can be controlled by
4654
giving another width to it separated by a comma.
4755

4856
--numstat::
49-
Similar to \--stat, but shows number of added and
57+
Similar to `\--stat`, but shows number of added and
5058
deleted lines in decimal notation and pathname without
5159
abbreviation, to make it more machine friendly. For
5260
binary files, outputs two `-` instead of saying
5361
`0 0`.
5462

5563
--shortstat::
56-
Output only the last line of the --stat format containing total
64+
Output only the last line of the `--stat` format containing total
5765
number of modified files, as well as number of added and deleted
5866
lines.
5967

6068
--dirstat[=limit]::
6169
Output the distribution of relative amount of changes (number of lines added or
6270
removed) for each sub-directory. Directories with changes below
6371
a cut-off percent (3% by default) are not shown. The cut-off percent
64-
can be set with "--dirstat=limit". Changes in a child directory is not
65-
counted for the parent directory, unless "--cumulative" is used.
72+
can be set with `--dirstat=limit`. Changes in a child directory is not
73+
counted for the parent directory, unless `--cumulative` is used.
6674

6775
--dirstat-by-file[=limit]::
68-
Same as --dirstat, but counts changed files instead of lines.
76+
Same as `--dirstat`, but counts changed files instead of lines.
6977

7078
--summary::
7179
Output a condensed summary of extended header information
7280
such as creations, renames and mode changes.
7381

82+
ifndef::git-format-patch[]
7483
--patch-with-stat::
75-
Synonym for "-p --stat".
76-
{git-format-patch? This is the default.}
84+
Synonym for `-p --stat`.
85+
endif::git-format-patch[]
7786

87+
ifndef::git-format-patch[]
7888
-z::
79-
NUL-line termination on output. This affects the --raw
89+
NUL-line termination on output. This affects the `--raw`
8090
output field terminator. Also output from commands such
81-
as "git-log" will be delimited with NUL between commits.
91+
as `git-log` will be delimited with NUL between commits.
8292

8393
--name-only::
8494
Show only names of changed files.
@@ -117,33 +127,36 @@ The regex can also be set via a diff driver or configuration option, see
117127
linkgit:gitattributes[1] or linkgit:git-config[1]. Giving it explicitly
118128
overrides any diff driver or configuration setting. Diff drivers
119129
override configuration settings.
130+
endif::git-format-patch[]
120131

121132
--no-renames::
122133
Turn off rename detection, even when the configuration
123134
file gives the default to do so.
124135

136+
ifndef::git-format-patch[]
125137
--check::
126138
Warn if changes introduce trailing whitespace
127139
or an indent that uses a space before a tab. Exits with
128140
non-zero status if problems are found. Not compatible with
129141
--exit-code.
142+
endif::git-format-patch[]
130143

131144
--full-index::
132145
Instead of the first handful of characters, show the full
133146
pre- and post-image blob object names on the "index"
134147
line when generating patch format output.
135148

136149
--binary::
137-
In addition to --full-index, output "binary diff" that
138-
can be applied with "git apply".
150+
In addition to `--full-index`, output a binary diff that
151+
can be applied with `git-apply`.
139152

140153
--abbrev[=<n>]::
141154
Instead of showing the full 40-byte hexadecimal object
142155
name in diff-raw format output and diff-tree header
143156
lines, show only a partial prefix. This is
144-
independent of --full-index option above, which controls
157+
independent of the `--full-index` option above, which controls
145158
the diff-patch output format. Non default number of
146-
digits can be specified with --abbrev=<n>.
159+
digits can be specified with `--abbrev=<n>`.
147160

148161
-B::
149162
Break complete rewrite changes into pairs of delete and create.
@@ -154,6 +167,7 @@ override configuration settings.
154167
-C::
155168
Detect copies as well as renames. See also `--find-copies-harder`.
156169

170+
ifndef::git-format-patch[]
157171
--diff-filter=[ACDMRTUXB*]::
158172
Select only files that are Added (`A`), Copied (`C`),
159173
Deleted (`D`), Modified (`M`), Renamed (`R`), have their
@@ -165,6 +179,7 @@ override configuration settings.
165179
paths are selected if there is any file that matches
166180
other criteria in the comparison; if there is no file
167181
that matches other criteria, nothing is selected.
182+
endif::git-format-patch[]
168183

169184
--find-copies-harder::
170185
For performance reasons, by default, `-C` option finds copies only
@@ -176,31 +191,34 @@ override configuration settings.
176191
`-C` option has the same effect.
177192

178193
-l<num>::
179-
-M and -C options require O(n^2) processing time where n
194+
The `-M` and `-C` options require O(n^2) processing time where n
180195
is the number of potential rename/copy targets. This
181196
option prevents rename/copy detection from running if
182197
the number of rename/copy targets exceeds the specified
183198
number.
184199

200+
ifndef::git-format-patch[]
185201
-S<string>::
186202
Look for differences that introduce or remove an instance of
187203
<string>. Note that this is different than the string simply
188204
appearing in diff output; see the 'pickaxe' entry in
189205
linkgit:gitdiffcore[7] for more details.
190206

191207
--pickaxe-all::
192-
When -S finds a change, show all the changes in that
208+
When `-S` finds a change, show all the changes in that
193209
changeset, not just the files that contain the change
194210
in <string>.
195211

196212
--pickaxe-regex::
197213
Make the <string> not a plain string but an extended POSIX
198214
regex to match.
215+
endif::git-format-patch[]
199216

200217
-O<orderfile>::
201218
Output the patch in the order specified in the
202219
<orderfile>, which has one shell glob pattern per line.
203220

221+
ifndef::git-format-patch[]
204222
-R::
205223
Swap two inputs; that is, show differences from index or
206224
on-disk file to tree contents.
@@ -212,6 +230,7 @@ override configuration settings.
212230
not in a subdirectory (e.g. in a bare repository), you
213231
can name which subdirectory to make the output relative
214232
to by giving a <path> as an argument.
233+
endif::git-format-patch[]
215234

216235
-a::
217236
--text::
@@ -236,13 +255,15 @@ override configuration settings.
236255
Show the context between diff hunks, up to the specified number
237256
of lines, thereby fusing hunks that are close to each other.
238257

258+
ifndef::git-format-patch[]
239259
--exit-code::
240260
Make the program exit with codes similar to diff(1).
241261
That is, it exits with 1 if there were differences and
242262
0 means no differences.
243263

244264
--quiet::
245-
Disable all output of the program. Implies --exit-code.
265+
Disable all output of the program. Implies `--exit-code`.
266+
endif::git-format-patch[]
246267

247268
--ext-diff::
248269
Allow an external diff helper to be executed. If you set an

‎git-commit.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ <h2 id="_environment_and_configuration_variables">ENVIRONMENT AND CONFIGURATION
850850
<div class="para"><p>The editor used to edit the commit log message will be chosen from the
851851
GIT_EDITOR environment variable, the core.editor configuration variable, the
852852
VISUAL environment variable, or the EDITOR environment variable (in that
853-
order).</p></div>
853+
order). See <a href="git-var.html">git-var(1)</a> for details.</p></div>
854854
</div>
855855
<h2 id="_hooks">HOOKS</h2>
856856
<div class="sectionbody">
@@ -877,7 +877,7 @@ <h2 id="_git">GIT</h2>
877877
</div>
878878
<div id="footer">
879879
<div id="footer-text">
880-
Last updated 2009-11-15 09:57:02 UTC
880+
Last updated 2009-11-21 17:36:52 UTC
881881
</div>
882882
</div>
883883
</body>

‎git-commit.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ ENVIRONMENT AND CONFIGURATION VARIABLES
323323
The editor used to edit the commit log message will be chosen from the
324324
GIT_EDITOR environment variable, the core.editor configuration variable, the
325325
VISUAL environment variable, or the EDITOR environment variable (in that
326-
order).
326+
order). See linkgit:git-var[1] for details.
327327

328328
HOOKS
329329
-----

‎git-config.html‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,9 +1265,7 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
12651265
Commands such as <tt>commit</tt> and <tt>tag</tt> that lets you edit
12661266
messages by launching an editor uses the value of this
12671267
variable when it is set, and the environment variable
1268-
<tt>GIT_EDITOR</tt> is not set. The order of preference is
1269-
<tt>GIT_EDITOR</tt> environment, <tt>core.editor</tt>, <tt>VISUAL</tt> and
1270-
<tt>EDITOR</tt> environment variables and then finally <tt>vi</tt>.
1268+
<tt>GIT_EDITOR</tt> is not set. See <a href="git-var.html">git-var(1)</a>.
12711269
</p>
12721270
</dd>
12731271
<dt>
@@ -1385,6 +1383,22 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
13851383
check that makes sure that existing object files will not get overwritten.</p></div>
13861384
</dd>
13871385
<dt>
1386+
core.notesRef
1387+
</dt>
1388+
<dd>
1389+
<p>
1390+
When showing commit messages, also show notes which are stored in
1391+
the given ref. This ref is expected to contain files named
1392+
after the full SHA-1 of the commit they annotate.
1393+
</p>
1394+
<div class="para"><p>If such a file exists in the given ref, the referenced blob is read, and
1395+
appended to the commit message, separated by a "Notes:" line. If the
1396+
given ref itself does not exist, it is not an error, but means that no
1397+
notes should be printed.</p></div>
1398+
<div class="para"><p>This setting defaults to "refs/notes/commits", and can be overridden by
1399+
the <tt>GIT_NOTES_REF</tt> environment variable.</p></div>
1400+
</dd>
1401+
<dt>
13881402
add.ignore-errors
13891403
</dt>
13901404
<dd>
@@ -2546,6 +2560,19 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
25462560
</p>
25472561
</dd>
25482562
<dt>
2563+
http.postBuffer
2564+
</dt>
2565+
<dd>
2566+
<p>
2567+
Maximum size in bytes of the buffer used by smart HTTP
2568+
transports when POSTing data to the remote system.
2569+
For requests larger than this buffer size, HTTP/1.1 and
2570+
Transfer-Encoding: chunked is used to avoid creating a
2571+
massive pack file locally. Default is 1 MiB, which is
2572+
sufficient for most requests.
2573+
</p>
2574+
</dd>
2575+
<dt>
25492576
http.lowSpeedLimit, http.lowSpeedTime
25502577
</dt>
25512578
<dd>
@@ -3563,7 +3590,7 @@ <h2 id="_git">GIT</h2>
35633590
</div>
35643591
<div id="footer">
35653592
<div id="footer-text">
3566-
Last updated 2009-11-16 02:10:11 UTC
3593+
Last updated 2009-11-21 17:36:52 UTC
35673594
</div>
35683595
</div>
35693596
</body>

0 commit comments

Comments
 (0)