Permalink
Browse files

Autogenerated HTML docs for v1.6.6-102-gd6f8

  • Loading branch information...
Junio C Hamano
Junio C Hamano committed Jan 8, 2010
1 parent 6d325df commit ae05feeb712a3d1be55164218489ebebef0f72b2
Showing with 311 additions and 64 deletions.
  1. +7 −1 RelNotes-1.7.0.txt
  2. +26 −0 date-formats.txt
  3. +32 −25 git-add.html
  4. +32 −25 git-add.txt
  5. +47 −1 git-commit-tree.html
  6. +1 −0 git-commit-tree.txt
  7. +57 −2 git-commit.html
  8. +6 −1 git-commit.txt
  9. +47 −5 git-rm.html
  10. +56 −4 git-rm.txt
View
@@ -50,6 +50,12 @@ Updates since v1.6.6
(usability, bells and whistles)
+ * "git commit --date='<date>'" can be used to override the author date
+ just like "git commit --author='<name> <email>'" can be used to
+ override the author identity.
+
+ * "git status" learned "-s(hort)" output format.
+
Fixes since v1.6.6
------------------
@@ -59,6 +65,6 @@ release, unless otherwise noted.
--
exec >/var/tmp/1
-O=v1.6.6-27-g648f407
+O=v1.6.6-101-gf012d27
echo O=$(git describe master)
git shortlog --no-merges $O..master ^maint
View
@@ -0,0 +1,26 @@
+DATE FORMATS
+------------
+
+The GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables
+ifdef::git-commit[]
+and the `--date` option
+endif::git-commit[]
+support the following date formats:
+
+Git internal format::
+ It is `<unix timestamp> <timezone offset>`, where `<unix
+ timestamp>` is the number of seconds since the UNIX epoch.
+ `<timezone offset>` is a positive or negative offset from UTC.
+ For example CET (which is 2 hours ahead UTC) is `+0200`.
+
+RFC 2822::
+ The standard email format as described by RFC 2822, for example
+ `Thu, 07 Apr 2005 22:13:13 +0200`.
+
+ISO 8601::
+ Time and date specified by the ISO 8601 standard, for example
+ `2005-04-07T22:13:13`. The parser accepts a space instead of the
+ `T` character as well.
++
+NOTE: In addition, the date part is accepted in the following formats:
+`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`.
View
@@ -327,24 +327,28 @@ <h2>SYNOPSIS</h2>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>This command adds the current content of new or modified files to the
-index, thus staging that content for inclusion in the next commit.</p></div>
+<div class="para"><p>This command updates the index using the current content found in
+the working tree, to prepare the content staged for the next commit.
+It typically adds the current content of existing paths as a whole,
+but with some options it can also be used to add content with
+only part of the changes made to the working tree files applied, or
+remove paths that do not exist in the working tree anymore.</p></div>
<div class="para"><p>The "index" holds a snapshot of the content of the working tree, and it
is this snapshot that is taken as the contents of the next commit. Thus
after making any changes to the working directory, and before running
-the commit command, you must use the <em>add</em> command to add any new or
+the commit command, you must use the <tt>add</tt> command to add any new or
modified files to the index.</p></div>
<div class="para"><p>This command can be performed multiple times before a commit. It only
adds the content of the specified file(s) at the time the add command is
run; if you want subsequent changes included in the next commit, then
-you must run <em>git add</em> again to add the new content to the index.</p></div>
-<div class="para"><p>The <em>git status</em> command can be used to obtain a summary of which
+you must run <tt>git add</tt> again to add the new content to the index.</p></div>
+<div class="para"><p>The <tt>git status</tt> command can be used to obtain a summary of which
files have changes that are staged for the next commit.</p></div>
-<div class="para"><p>The <em>git add</em> command will not add ignored files by default. If any
-ignored files were explicitly specified on the command line, <em>git add</em>
+<div class="para"><p>The <tt>git add</tt> command will not add ignored files by default. If any
+ignored files were explicitly specified on the command line, <tt>git add</tt>
will fail with a list of ignored files. Ignored files reached by
directory recursion or filename globbing performed by Git (quote your
-globs before the shell) will be silently ignored. The <em>add</em> command can
+globs before the shell) will be silently ignored. The <tt>add</tt> command can
be used to add ignored files with the <tt>-f</tt> (force) option.</p></div>
<div class="para"><p>Please see <a href="git-commit.html">git-commit(1)</a> for alternative ways to add content to a
commit.</p></div>
@@ -449,14 +453,16 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Update only files that git already knows about, staging modified
- content for commit and marking deleted files for removal. This
- is similar
- to what "git commit -a" does in preparation for making a commit,
- except that the update is limited to paths specified on the
- command line. If no paths are specified, all tracked files in the
- current directory and its subdirectories are updated.
+ Only match &lt;filepattern&gt; against already tracked files in
+ the index rather than the working tree. That means that it
+ will never stage new files, but that it will stage modified
+ new contents of tracked files and that it will remove files
+ from the index if the corresponding files in the working tree
+ have been removed.
</p>
+<div class="para"><p>If no &lt;filepattern&gt; is given, default to "."; in other words,
+update all tracked files in the current directory and its
+subdirectories.</p></div>
</dd>
<dt>
-A
@@ -466,9 +472,10 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Update files that git already knows about (same as <em>--update</em>)
- and add all untracked files that are not ignored by <em>.gitignore</em>
- mechanism.
+ Like <tt>-u</tt>, but match &lt;filepattern&gt; against files in the
+ working tree in addition to the index. That means that it
+ will find new files as well as staging modified content and
+ removing files that are no longer in the working tree.
</p>
</dd>
<dt>
@@ -482,8 +489,8 @@ <h2 id="_options">OPTIONS</h2>
Record only the fact that the path will be added later. An entry
for the path is placed in the index with no content. This is
useful for, among other things, showing the unstaged content of
- such files with <em>git diff</em> and committing them with <em>git commit
- -a</em>.
+ such files with <tt>git diff</tt> and committing them with <tt>git commit
+ -a</tt>.
</p>
</dd>
<dt>
@@ -519,7 +526,7 @@ <h2 id="_options">OPTIONS</h2>
</div>
<h2 id="_configuration">Configuration</h2>
<div class="sectionbody">
-<div class="para"><p>The optional configuration variable <em>core.excludesfile</em> indicates a path to a
+<div class="para"><p>The optional configuration variable <tt>core.excludesfile</tt> indicates a path to a
file containing patterns of file names to exclude from git-add, similar to
$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
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>
5: patch 6: diff 7: quit 8: help
What now&gt; 1</tt></pre>
</div></div>
-<div class="para"><p>You also could say "s" or "sta" or "status" above as long as the
+<div class="para"><p>You also could say <tt>s</tt> or <tt>sta</tt> or <tt>status</tt> above as long as the
choice is unique.</p></div>
<div class="para"><p>The main command loop has 6 subcommands (plus help and quit).</p></div>
<div class="vlist"><dl>
@@ -580,9 +587,9 @@ <h2 id="_interactive_mode">Interactive mode</h2>
<dd>
<p>
This shows the change between HEAD and index (i.e. what will be
- committed if you say "git commit"), and between index and
+ committed if you say <tt>git commit</tt>), and between index and
working tree files (i.e. what you could stage further before
- "git commit" using "git-add") for each path. A sample output
+ <tt>git commit</tt> using <tt>git add</tt>) for each path. A sample output
looks like this:
</p>
<div class="listingblock">
@@ -714,7 +721,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-12-03 09:12:25 UTC
+Last updated 2010-01-08 07:39:28 UTC
</div>
</div>
</body>
View
@@ -14,28 +14,32 @@ SYNOPSIS
DESCRIPTION
-----------
-This command adds the current content of new or modified files to the
-index, thus staging that content for inclusion in the next commit.
+This command updates the index using the current content found in
+the working tree, to prepare the content staged for the next commit.
+It typically adds the current content of existing paths as a whole,
+but with some options it can also be used to add content with
+only part of the changes made to the working tree files applied, or
+remove paths that do not exist in the working tree anymore.
The "index" holds a snapshot of the content of the working tree, and it
is this snapshot that is taken as the contents of the next commit. Thus
after making any changes to the working directory, and before running
-the commit command, you must use the 'add' command to add any new or
+the commit command, you must use the `add` command to add any new or
modified files to the index.
This command can be performed multiple times before a commit. It only
adds the content of the specified file(s) at the time the add command is
run; if you want subsequent changes included in the next commit, then
-you must run 'git add' again to add the new content to the index.
+you must run `git add` again to add the new content to the index.
-The 'git status' command can be used to obtain a summary of which
+The `git status` command can be used to obtain a summary of which
files have changes that are staged for the next commit.
-The 'git add' command will not add ignored files by default. If any
-ignored files were explicitly specified on the command line, 'git add'
+The `git add` command will not add ignored files by default. If any
+ignored files were explicitly specified on the command line, `git add`
will fail with a list of ignored files. Ignored files reached by
directory recursion or filename globbing performed by Git (quote your
-globs before the shell) will be silently ignored. The 'add' command can
+globs before the shell) will be silently ignored. The `add` command can
be used to add ignored files with the `-f` (force) option.
Please see linkgit:git-commit[1] for alternative ways to add content to a
@@ -92,28 +96,31 @@ apply.
-u::
--update::
- Update only files that git already knows about, staging modified
- content for commit and marking deleted files for removal. This
- is similar
- to what "git commit -a" does in preparation for making a commit,
- except that the update is limited to paths specified on the
- command line. If no paths are specified, all tracked files in the
- current directory and its subdirectories are updated.
+ Only match <filepattern> against already tracked files in
+ the index rather than the working tree. That means that it
+ will never stage new files, but that it will stage modified
+ new contents of tracked files and that it will remove files
+ from the index if the corresponding files in the working tree
+ have been removed.
++
+If no <filepattern> is given, default to "."; in other words,
+update all tracked files in the current directory and its
+subdirectories.
-A::
--all::
- Update files that git already knows about (same as '\--update')
- and add all untracked files that are not ignored by '.gitignore'
- mechanism.
-
+ Like `-u`, but match <filepattern> against files in the
+ working tree in addition to the index. That means that it
+ will find new files as well as staging modified content and
+ removing files that are no longer in the working tree.
-N::
--intent-to-add::
Record only the fact that the path will be added later. An entry
for the path is placed in the index with no content. This is
useful for, among other things, showing the unstaged content of
- such files with 'git diff' and committing them with 'git commit
- -a'.
+ such files with `git diff` and committing them with `git commit
+ -a`.
--refresh::
Don't add the file(s), but only refresh their stat()
@@ -133,7 +140,7 @@ apply.
Configuration
-------------
-The optional configuration variable 'core.excludesfile' indicates a path to a
+The optional configuration variable `core.excludesfile` indicates a path to a
file containing patterns of file names to exclude from git-add, similar to
$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
those in info/exclude. See linkgit:gitrepository-layout[5].
@@ -181,17 +188,17 @@ and type return, like this:
What now> 1
------------
-You also could say "s" or "sta" or "status" above as long as the
+You also could say `s` or `sta` or `status` above as long as the
choice is unique.
The main command loop has 6 subcommands (plus help and quit).
status::
This shows the change between HEAD and index (i.e. what will be
- committed if you say "git commit"), and between index and
+ committed if you say `git commit`), and between index and
working tree files (i.e. what you could stage further before
- "git commit" using "git-add") for each path. A sample output
+ `git commit` using `git add`) for each path. A sample output
looks like this:
+
------------
View
@@ -403,6 +403,52 @@ <h2 id="_commit_information">Commit Information</h2>
entry is not provided via "&lt;" redirection, <em>git-commit-tree</em> will just wait
for one to be entered and terminated with ^D.</p></div>
</div>
+<h2 id="_date_formats">DATE FORMATS</h2>
+<div class="sectionbody">
+<div class="para"><p>The GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables
+support the following date formats:</p></div>
+<div class="vlist"><dl>
+<dt>
+Git internal format
+</dt>
+<dd>
+<p>
+ It is <tt>&lt;unix timestamp&gt; &lt;timezone offset&gt;</tt>, where <tt>&lt;unix
+ timestamp&gt;</tt> is the number of seconds since the UNIX epoch.
+ <tt>&lt;timezone offset&gt;</tt> is a positive or negative offset from UTC.
+ For example CET (which is 2 hours ahead UTC) is <tt>+0200</tt>.
+</p>
+</dd>
+<dt>
+RFC 2822
+</dt>
+<dd>
+<p>
+ The standard email format as described by RFC 2822, for example
+ <tt>Thu, 07 Apr 2005 22:13:13 +0200</tt>.
+</p>
+</dd>
+<dt>
+ISO 8601
+</dt>
+<dd>
+<p>
+ Time and date specified by the ISO 8601 standard, for example
+ <tt>2005-04-07T22:13:13</tt>. The parser accepts a space instead of the
+ <tt>T</tt> character as well.
+</p>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">In addition, the date part is accepted in the following formats:
+<tt>YYYY.MM.DD</tt>, <tt>MM/DD/YYYY</tt> and <tt>DD.MM.YYYY</tt>.</td>
+</tr></table>
+</div>
+</dd>
+</dl></div>
+</div>
<h2 id="_diagnostics">Diagnostics</h2>
<div class="sectionbody">
<div class="vlist"><dl>
@@ -525,7 +571,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-12-03 09:12:29 UTC
+Last updated 2010-01-08 07:39:28 UTC
</div>
</div>
</body>
View
@@ -73,6 +73,7 @@ A commit comment is read from stdin. If a changelog
entry is not provided via "<" redirection, 'git-commit-tree' will just wait
for one to be entered and terminated with ^D.
+include::date-formats.txt[]
Diagnostics
-----------
Oops, something went wrong.

0 comments on commit ae05fee

Please sign in to comment.