Skip to content

Commit ae05fee

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.6.6-102-gd6f8
1 parent 6d325df commit ae05fee

File tree

10 files changed

+311
-64
lines changed

10 files changed

+311
-64
lines changed

‎RelNotes-1.7.0.txt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ Updates since v1.6.6
5050

5151
(usability, bells and whistles)
5252

53+
* "git commit --date='<date>'" can be used to override the author date
54+
just like "git commit --author='<name> <email>'" can be used to
55+
override the author identity.
56+
57+
* "git status" learned "-s(hort)" output format.
58+
5359

5460
Fixes since v1.6.6
5561
------------------
@@ -59,6 +65,6 @@ release, unless otherwise noted.
5965

6066
--
6167
exec >/var/tmp/1
62-
O=v1.6.6-27-g648f407
68+
O=v1.6.6-101-gf012d27
6369
echo O=$(git describe master)
6470
git shortlog --no-merges $O..master ^maint

‎date-formats.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
DATE FORMATS
2+
------------
3+
4+
The GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables
5+
ifdef::git-commit[]
6+
and the `--date` option
7+
endif::git-commit[]
8+
support the following date formats:
9+
10+
Git internal format::
11+
It is `<unix timestamp> <timezone offset>`, where `<unix
12+
timestamp>` is the number of seconds since the UNIX epoch.
13+
`<timezone offset>` is a positive or negative offset from UTC.
14+
For example CET (which is 2 hours ahead UTC) is `+0200`.
15+
16+
RFC 2822::
17+
The standard email format as described by RFC 2822, for example
18+
`Thu, 07 Apr 2005 22:13:13 +0200`.
19+
20+
ISO 8601::
21+
Time and date specified by the ISO 8601 standard, for example
22+
`2005-04-07T22:13:13`. The parser accepts a space instead of the
23+
`T` character as well.
24+
+
25+
NOTE: In addition, the date part is accepted in the following formats:
26+
`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`.

‎git-add.html‎

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -327,24 +327,28 @@ <h2>SYNOPSIS</h2>
327327
</div>
328328
<h2 id="_description">DESCRIPTION</h2>
329329
<div class="sectionbody">
330-
<div class="para"><p>This command adds the current content of new or modified files to the
331-
index, thus staging that content for inclusion in the next commit.</p></div>
330+
<div class="para"><p>This command updates the index using the current content found in
331+
the working tree, to prepare the content staged for the next commit.
332+
It typically adds the current content of existing paths as a whole,
333+
but with some options it can also be used to add content with
334+
only part of the changes made to the working tree files applied, or
335+
remove paths that do not exist in the working tree anymore.</p></div>
332336
<div class="para"><p>The "index" holds a snapshot of the content of the working tree, and it
333337
is this snapshot that is taken as the contents of the next commit. Thus
334338
after making any changes to the working directory, and before running
335-
the commit command, you must use the <em>add</em> command to add any new or
339+
the commit command, you must use the <tt>add</tt> command to add any new or
336340
modified files to the index.</p></div>
337341
<div class="para"><p>This command can be performed multiple times before a commit. It only
338342
adds the content of the specified file(s) at the time the add command is
339343
run; if you want subsequent changes included in the next commit, then
340-
you must run <em>git add</em> again to add the new content to the index.</p></div>
341-
<div class="para"><p>The <em>git status</em> command can be used to obtain a summary of which
344+
you must run <tt>git add</tt> again to add the new content to the index.</p></div>
345+
<div class="para"><p>The <tt>git status</tt> command can be used to obtain a summary of which
342346
files have changes that are staged for the next commit.</p></div>
343-
<div class="para"><p>The <em>git add</em> command will not add ignored files by default. If any
344-
ignored files were explicitly specified on the command line, <em>git add</em>
347+
<div class="para"><p>The <tt>git add</tt> command will not add ignored files by default. If any
348+
ignored files were explicitly specified on the command line, <tt>git add</tt>
345349
will fail with a list of ignored files. Ignored files reached by
346350
directory recursion or filename globbing performed by Git (quote your
347-
globs before the shell) will be silently ignored. The <em>add</em> command can
351+
globs before the shell) will be silently ignored. The <tt>add</tt> command can
348352
be used to add ignored files with the <tt>-f</tt> (force) option.</p></div>
349353
<div class="para"><p>Please see <a href="git-commit.html">git-commit(1)</a> for alternative ways to add content to a
350354
commit.</p></div>
@@ -449,14 +453,16 @@ <h2 id="_options">OPTIONS</h2>
449453
</dt>
450454
<dd>
451455
<p>
452-
Update only files that git already knows about, staging modified
453-
content for commit and marking deleted files for removal. This
454-
is similar
455-
to what "git commit -a" does in preparation for making a commit,
456-
except that the update is limited to paths specified on the
457-
command line. If no paths are specified, all tracked files in the
458-
current directory and its subdirectories are updated.
456+
Only match &lt;filepattern&gt; against already tracked files in
457+
the index rather than the working tree. That means that it
458+
will never stage new files, but that it will stage modified
459+
new contents of tracked files and that it will remove files
460+
from the index if the corresponding files in the working tree
461+
have been removed.
459462
</p>
463+
<div class="para"><p>If no &lt;filepattern&gt; is given, default to "."; in other words,
464+
update all tracked files in the current directory and its
465+
subdirectories.</p></div>
460466
</dd>
461467
<dt>
462468
-A
@@ -466,9 +472,10 @@ <h2 id="_options">OPTIONS</h2>
466472
</dt>
467473
<dd>
468474
<p>
469-
Update files that git already knows about (same as <em>--update</em>)
470-
and add all untracked files that are not ignored by <em>.gitignore</em>
471-
mechanism.
475+
Like <tt>-u</tt>, but match &lt;filepattern&gt; against files in the
476+
working tree in addition to the index. That means that it
477+
will find new files as well as staging modified content and
478+
removing files that are no longer in the working tree.
472479
</p>
473480
</dd>
474481
<dt>
@@ -482,8 +489,8 @@ <h2 id="_options">OPTIONS</h2>
482489
Record only the fact that the path will be added later. An entry
483490
for the path is placed in the index with no content. This is
484491
useful for, among other things, showing the unstaged content of
485-
such files with <em>git diff</em> and committing them with <em>git commit
486-
-a</em>.
492+
such files with <tt>git diff</tt> and committing them with <tt>git commit
493+
-a</tt>.
487494
</p>
488495
</dd>
489496
<dt>
@@ -519,7 +526,7 @@ <h2 id="_options">OPTIONS</h2>
519526
</div>
520527
<h2 id="_configuration">Configuration</h2>
521528
<div class="sectionbody">
522-
<div class="para"><p>The optional configuration variable <em>core.excludesfile</em> indicates a path to a
529+
<div class="para"><p>The optional configuration variable <tt>core.excludesfile</tt> indicates a path to a
523530
file containing patterns of file names to exclude from git-add, similar to
524531
$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
525532
those in info/exclude. See <a href="gitrepository-layout.html">gitrepository-layout(5)</a>.</p></div>
@@ -570,7 +577,7 @@ <h2 id="_interactive_mode">Interactive mode</h2>
570577
5: patch 6: diff 7: quit 8: help
571578
What now&gt; 1</tt></pre>
572579
</div></div>
573-
<div class="para"><p>You also could say "s" or "sta" or "status" above as long as the
580+
<div class="para"><p>You also could say <tt>s</tt> or <tt>sta</tt> or <tt>status</tt> above as long as the
574581
choice is unique.</p></div>
575582
<div class="para"><p>The main command loop has 6 subcommands (plus help and quit).</p></div>
576583
<div class="vlist"><dl>
@@ -580,9 +587,9 @@ <h2 id="_interactive_mode">Interactive mode</h2>
580587
<dd>
581588
<p>
582589
This shows the change between HEAD and index (i.e. what will be
583-
committed if you say "git commit"), and between index and
590+
committed if you say <tt>git commit</tt>), and between index and
584591
working tree files (i.e. what you could stage further before
585-
"git commit" using "git-add") for each path. A sample output
592+
<tt>git commit</tt> using <tt>git add</tt>) for each path. A sample output
586593
looks like this:
587594
</p>
588595
<div class="listingblock">
@@ -714,7 +721,7 @@ <h2 id="_git">GIT</h2>
714721
</div>
715722
<div id="footer">
716723
<div id="footer-text">
717-
Last updated 2009-12-03 09:12:25 UTC
724+
Last updated 2010-01-08 07:39:28 UTC
718725
</div>
719726
</div>
720727
</body>

‎git-add.txt‎

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,32 @@ SYNOPSIS
1414

1515
DESCRIPTION
1616
-----------
17-
This command adds the current content of new or modified files to the
18-
index, thus staging that content for inclusion in the next commit.
17+
This command updates the index using the current content found in
18+
the working tree, to prepare the content staged for the next commit.
19+
It typically adds the current content of existing paths as a whole,
20+
but with some options it can also be used to add content with
21+
only part of the changes made to the working tree files applied, or
22+
remove paths that do not exist in the working tree anymore.
1923

2024
The "index" holds a snapshot of the content of the working tree, and it
2125
is this snapshot that is taken as the contents of the next commit. Thus
2226
after making any changes to the working directory, and before running
23-
the commit command, you must use the 'add' command to add any new or
27+
the commit command, you must use the `add` command to add any new or
2428
modified files to the index.
2529

2630
This command can be performed multiple times before a commit. It only
2731
adds the content of the specified file(s) at the time the add command is
2832
run; if you want subsequent changes included in the next commit, then
29-
you must run 'git add' again to add the new content to the index.
33+
you must run `git add` again to add the new content to the index.
3034

31-
The 'git status' command can be used to obtain a summary of which
35+
The `git status` command can be used to obtain a summary of which
3236
files have changes that are staged for the next commit.
3337

34-
The 'git add' command will not add ignored files by default. If any
35-
ignored files were explicitly specified on the command line, 'git add'
38+
The `git add` command will not add ignored files by default. If any
39+
ignored files were explicitly specified on the command line, `git add`
3640
will fail with a list of ignored files. Ignored files reached by
3741
directory recursion or filename globbing performed by Git (quote your
38-
globs before the shell) will be silently ignored. The 'add' command can
42+
globs before the shell) will be silently ignored. The `add` command can
3943
be used to add ignored files with the `-f` (force) option.
4044

4145
Please see linkgit:git-commit[1] for alternative ways to add content to a
@@ -92,28 +96,31 @@ apply.
9296

9397
-u::
9498
--update::
95-
Update only files that git already knows about, staging modified
96-
content for commit and marking deleted files for removal. This
97-
is similar
98-
to what "git commit -a" does in preparation for making a commit,
99-
except that the update is limited to paths specified on the
100-
command line. If no paths are specified, all tracked files in the
101-
current directory and its subdirectories are updated.
99+
Only match <filepattern> against already tracked files in
100+
the index rather than the working tree. That means that it
101+
will never stage new files, but that it will stage modified
102+
new contents of tracked files and that it will remove files
103+
from the index if the corresponding files in the working tree
104+
have been removed.
105+
+
106+
If no <filepattern> is given, default to "."; in other words,
107+
update all tracked files in the current directory and its
108+
subdirectories.
102109

103110
-A::
104111
--all::
105-
Update files that git already knows about (same as '\--update')
106-
and add all untracked files that are not ignored by '.gitignore'
107-
mechanism.
108-
112+
Like `-u`, but match <filepattern> against files in the
113+
working tree in addition to the index. That means that it
114+
will find new files as well as staging modified content and
115+
removing files that are no longer in the working tree.
109116

110117
-N::
111118
--intent-to-add::
112119
Record only the fact that the path will be added later. An entry
113120
for the path is placed in the index with no content. This is
114121
useful for, among other things, showing the unstaged content of
115-
such files with 'git diff' and committing them with 'git commit
116-
-a'.
122+
such files with `git diff` and committing them with `git commit
123+
-a`.
117124

118125
--refresh::
119126
Don't add the file(s), but only refresh their stat()
@@ -133,7 +140,7 @@ apply.
133140
Configuration
134141
-------------
135142

136-
The optional configuration variable 'core.excludesfile' indicates a path to a
143+
The optional configuration variable `core.excludesfile` indicates a path to a
137144
file containing patterns of file names to exclude from git-add, similar to
138145
$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
139146
those in info/exclude. See linkgit:gitrepository-layout[5].
@@ -181,17 +188,17 @@ and type return, like this:
181188
What now> 1
182189
------------
183190

184-
You also could say "s" or "sta" or "status" above as long as the
191+
You also could say `s` or `sta` or `status` above as long as the
185192
choice is unique.
186193

187194
The main command loop has 6 subcommands (plus help and quit).
188195

189196
status::
190197

191198
This shows the change between HEAD and index (i.e. what will be
192-
committed if you say "git commit"), and between index and
199+
committed if you say `git commit`), and between index and
193200
working tree files (i.e. what you could stage further before
194-
"git commit" using "git-add") for each path. A sample output
201+
`git commit` using `git add`) for each path. A sample output
195202
looks like this:
196203
+
197204
------------

‎git-commit-tree.html‎

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,52 @@ <h2 id="_commit_information">Commit Information</h2>
403403
entry is not provided via "&lt;" redirection, <em>git-commit-tree</em> will just wait
404404
for one to be entered and terminated with ^D.</p></div>
405405
</div>
406+
<h2 id="_date_formats">DATE FORMATS</h2>
407+
<div class="sectionbody">
408+
<div class="para"><p>The GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables
409+
support the following date formats:</p></div>
410+
<div class="vlist"><dl>
411+
<dt>
412+
Git internal format
413+
</dt>
414+
<dd>
415+
<p>
416+
It is <tt>&lt;unix timestamp&gt; &lt;timezone offset&gt;</tt>, where <tt>&lt;unix
417+
timestamp&gt;</tt> is the number of seconds since the UNIX epoch.
418+
<tt>&lt;timezone offset&gt;</tt> is a positive or negative offset from UTC.
419+
For example CET (which is 2 hours ahead UTC) is <tt>+0200</tt>.
420+
</p>
421+
</dd>
422+
<dt>
423+
RFC 2822
424+
</dt>
425+
<dd>
426+
<p>
427+
The standard email format as described by RFC 2822, for example
428+
<tt>Thu, 07 Apr 2005 22:13:13 +0200</tt>.
429+
</p>
430+
</dd>
431+
<dt>
432+
ISO 8601
433+
</dt>
434+
<dd>
435+
<p>
436+
Time and date specified by the ISO 8601 standard, for example
437+
<tt>2005-04-07T22:13:13</tt>. The parser accepts a space instead of the
438+
<tt>T</tt> character as well.
439+
</p>
440+
<div class="admonitionblock">
441+
<table><tr>
442+
<td class="icon">
443+
<div class="title">Note</div>
444+
</td>
445+
<td class="content">In addition, the date part is accepted in the following formats:
446+
<tt>YYYY.MM.DD</tt>, <tt>MM/DD/YYYY</tt> and <tt>DD.MM.YYYY</tt>.</td>
447+
</tr></table>
448+
</div>
449+
</dd>
450+
</dl></div>
451+
</div>
406452
<h2 id="_diagnostics">Diagnostics</h2>
407453
<div class="sectionbody">
408454
<div class="vlist"><dl>
@@ -525,7 +571,7 @@ <h2 id="_git">GIT</h2>
525571
</div>
526572
<div id="footer">
527573
<div id="footer-text">
528-
Last updated 2009-12-03 09:12:29 UTC
574+
Last updated 2010-01-08 07:39:28 UTC
529575
</div>
530576
</div>
531577
</body>

‎git-commit-tree.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ A commit comment is read from stdin. If a changelog
7373
entry is not provided via "<" redirection, 'git-commit-tree' will just wait
7474
for one to be entered and terminated with ^D.
7575

76+
include::date-formats.txt[]
7677

7778
Diagnostics
7879
-----------

0 commit comments

Comments
 (0)