user.email::
Your email address to be recorded in any newly created commits.
- Can be overridden by the 'GIT_AUTHOR_EMAIL' and 'GIT_COMMITTER_EMAIL'
- environment variables. See gitlink:git-commit-tree[1].
+ Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and
+ 'EMAIL' environment variables. See gitlink:git-commit-tree[1].
user.name::
Your full name to be recorded in any newly created commits.
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
<div class="verseblock">\r
-<div class="content"><em>git-blame</em> [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m]\r
+<div class="content"><em>git-blame</em> [-c] [-b] [--root] [-s] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m]\r
[-S <revs-file>] [-M] [-C] [-C] [--since=<date>]\r
[<rev> | --contents <file>] [--] <file></div></div>\r
</div>\r
Show line number in the original commit (Default: off).\r
</p>\r
</dd>\r
+<dt>\r
+-s\r
+</dt>\r
+<dd>\r
+<p>\r
+ Suppress author name and timestamp from the output.\r
+</p>\r
+</dd>\r
</dl>\r
</div>\r
<h2>THE PORCELAIN FORMAT</h2>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Apr-2007 08:21:39 UTC\r
+Last updated 29-Apr-2007 18:29:50 UTC\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
[verse]
-'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m]
+'git-blame' [-c] [-b] [--root] [-s] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m]
[-S <revs-file>] [-M] [-C] [-C] [--since=<date>]
[<rev> | --contents <file>] [--] <file>
-n, --show-number::
Show line number in the original commit (Default: off).
+-s::
+ Suppress author name and timestamp from the output.
+
THE PORCELAIN FORMAT
--------------------
GIT_AUTHOR_EMAIL\r
GIT_AUTHOR_DATE\r
GIT_COMMITTER_NAME\r
-GIT_COMMITTER_EMAIL</tt></pre>\r
+GIT_COMMITTER_EMAIL\r
+GIT_COMMITTER_DATE\r
+EMAIL</tt></pre>\r
</div></div>\r
<p>(nb "<", ">" and "\n"s are stripped)</p>\r
<p>In <tt>.git/config</tt> file, the following items are used for GIT_AUTHOR_NAME and\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:34 UTC\r
+Last updated 29-Apr-2007 18:29:50 UTC\r
</div>\r
</div>\r
</body>\r
GIT_AUTHOR_DATE
GIT_COMMITTER_NAME
GIT_COMMITTER_EMAIL
+ GIT_COMMITTER_DATE
+ EMAIL
(nb "<", ">" and "\n"s are stripped)
<dd>\r
<p>\r
Your email address to be recorded in any newly created commits.\r
- Can be overridden by the <em>GIT_AUTHOR_EMAIL</em> and <em>GIT_COMMITTER_EMAIL</em>\r
- environment variables. See <a href="git-commit-tree.html">git-commit-tree(1)</a>.\r
+ Can be overridden by the <em>GIT_AUTHOR_EMAIL</em>, <em>GIT_COMMITTER_EMAIL</em>, and\r
+
<em>EMAIL</em> environment variables. See <a href="git-commit-tree.html">git-commit-tree(1)</a>.
\r </p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 24-Apr-2007 07:34:15 UTC\r
+Last updated 29-Apr-2007 18:29:50 UTC\r
</div>\r
</div>\r
</body>\r
<div class="sectionbody">\r
<div class="verseblock">\r
<div class="content">git-log --pretty=short | <em>git-shortlog</em> [-h] [-n] [-s]\r
-git-shortlog [-n|--number] [-s|--summary] [<committish>…]</div></div>\r
+git-shortlog [-n|--numbered] [-s|--summary] [<committish>…]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
<div class="sectionbody">\r
<dl>\r
<dt>\r
--h\r
+-h, --help\r
</dt>\r
<dd>\r
<p>\r
</p>\r
</dd>\r
<dt>\r
--n\r
+-n, --numbered\r
</dt>\r
<dd>\r
<p>\r
</p>\r
</dd>\r
<dt>\r
--s\r
+-s, --summary\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 18-Apr-2007 23:54:12 UTC\r
+Last updated 29-Apr-2007 18:29:50 UTC\r
</div>\r
</div>\r
</body>\r
--------
[verse]
git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s]
-git-shortlog [-n|--number] [-s|--summary] [<committish>...]
+git-shortlog [-n|--numbered] [-s|--summary] [<committish>...]
DESCRIPTION
-----------
OPTIONS
-------
--h::
+-h, \--help::
Print a short usage message and exit.
--n::
+-n, \--numbered::
Sort output according to the number of commits per author instead
of author alphabetic order.
--s::
+-s, \--summary::
Suppress commit description and provide a commit count summary only.
FILES
</dl>\r
<dl>\r
<dt>\r
+<em>find-rev</em>\r
+</dt>\r
+<dd>\r
+<p>\r
+ When given an SVN revision number of the form <em>rN</em>, returns the\r
+ corresponding git commit hash. When given a tree-ish, returns the\r
+ corresponding SVN revision number.\r
+</p>\r
+</dd>\r
+<dt>\r
<em>set-tree</em>\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:28 UTC\r
+Last updated 29-Apr-2007 18:29:51 UTC\r
</div>\r
</div>\r
</body>\r
Any other arguments are passed directly to `git log'
--
+'find-rev'::
+ When given an SVN revision number of the form 'rN', returns the
+ corresponding git commit hash. When given a tree-ish, returns the
+ corresponding SVN revision number.
+
'set-tree'::
You should consider using 'dcommit' instead of this command.
Commit specified commit or tree objects to SVN. This relies on
<dt>\r
<em>GIT_COMMITTER_EMAIL</em>\r
</dt>\r
+<dt>\r
+<em>GIT_COMMITTER_DATE</em>\r
+</dt>\r
+<dt>\r
+<em>EMAIL</em>\r
+</dt>\r
<dd>\r
<p>\r
see <a href="git-commit-tree.html">git-commit-tree(1)</a>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 22-Apr-2007 06:51:51 UTC\r
+Last updated 29-Apr-2007 18:29:52 UTC\r
</div>\r
</div>\r
</body>\r
'GIT_AUTHOR_DATE'::
'GIT_COMMITTER_NAME'::
'GIT_COMMITTER_EMAIL'::
+'GIT_COMMITTER_DATE'::
+'EMAIL'::
see gitlink:git-commit-tree[1]
git Diffs
particular attributes to a path. Currently, three operations\r
are attributes-aware.</p>\r
<h3>Checking-out and checking-in</h3>\r
-<p>The attribute <tt>crlf</tt> affects how the contents stored in the\r
+<p>These attributes affect how the contents stored in the\r
repository are copied to the working tree files when commands\r
-such as <tt>git checkout</tt> and <tt>git merge</tt> run. It also affects how\r
+such as <tt>git checkout</tt> and <tt>git merge</tt> run. They also affect how\r
git stores the contents you prepare in the working tree in the\r
repository upon <tt>git add</tt> and <tt>git commit</tt>.</p>\r
+<h4><tt>crlf</tt></h4>\r
+<p>This attribute controls the line-ending convention.</p>\r
<dl>\r
<dt>\r
Set\r
<p>When <tt>core.autocrlf</tt> is set to "input", line endings are\r
converted to LF upon checkin, but there is no conversion done\r
upon checkout.</p>\r
+<h4><tt>ident</tt></h4>\r
+<p>When the attribute <tt>ident</tt> is set to a path, git replaces\r
+<tt>$ident$</tt> in the blob object with <tt>$ident:</tt>, followed by\r
+40-character hexadecimal blob object name, followed by a dollar\r
+sign <tt>$</tt> upon checkout. Any byte sequence that begins with\r
+<tt>$ident:</tt> and ends with <tt>$</tt> in the worktree file is replaced\r
+with <tt>$ident$</tt> upon check-in.</p>\r
+<h4>Interaction between checkin/checkout attributes</h4>\r
+<p>In the check-in codepath, the worktree file is first converted\r
+with <tt>ident</tt> (if specified), and then with <tt>crlf</tt> (again, if\r
+specified and applicable).</p>\r
+<p>In the check-out codepath, the blob content is first converted\r
+with <tt>crlf</tt>, and then <tt>ident</tt>.</p>\r
+<h4><tt>filter</tt></h4>\r
+<p>A <tt>filter</tt> attribute can be set to a string value. This names\r
+filter driver specified in the configuration.</p>\r
+<p>A filter driver consists of <tt>clean</tt> command and <tt>smudge</tt>\r
+command, either of which can be left unspecified. Upon\r
+checkout, when <tt>smudge</tt> command is specified, the command is fed\r
+the blob object from its standard input, and its standard output\r
+is used to update the worktree file. Similarly, <tt>clean</tt> command\r
+is used to convert the contents of worktree file upon checkin.</p>\r
+<p>Missing filter driver definition in the config is not an error\r
+but makes the filter a no-op passthru.</p>\r
+<p>The content filtering is done to massage the content into a\r
+shape that is more convenient for the platform, filesystem, and\r
+the user to use. The keyword here is "more convenient" and not\r
+"turning something unusable into usable". In other words, it is\r
+"hanging yourself because we gave you a long rope" if your\r
+project uses filtering mechanism in such a way that it makes\r
+your project unusable unless the checkout is done with a\r
+specific filter in effect.</p>\r
+<h4>Interaction between checkin/checkout attributes</h4>\r
+<p>In the check-in codepath, the worktree file is first converted\r
+with <tt>filter</tt> driver (if specified and corresponding driver\r
+defined), then the result is processed with <tt>ident</tt> (if\r
+specified), and then finally with <tt>crlf</tt> (again, if specified\r
+and applicable).</p>\r
+<p>In the check-out codepath, the blob content is first converted\r
+with <tt>crlf</tt>, and then <tt>ident</tt> and fed to <tt>filter</tt>.</p>\r
<h3>Generating diff text</h3>\r
<p>The attribute <tt>diff</tt> affects if <tt>git diff</tt> generates textual\r
patch for the path or just says <tt>Binary files differ</tt>.</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Apr-2007 05:59:11 UTC\r
+Last updated 29-Apr-2007 18:29:52 UTC\r
</div>\r
</div>\r
</body>\r
Checking-out and checking-in
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The attribute `crlf` affects how the contents stored in the
+These attributes affect how the contents stored in the
repository are copied to the working tree files when commands
-such as `git checkout` and `git merge` run. It also affects how
+such as `git checkout` and `git merge` run. They also affect how
git stores the contents you prepare in the working tree in the
repository upon `git add` and `git commit`.
+`crlf`
+^^^^^^
+
+This attribute controls the line-ending convention.
+
Set::
Setting the `crlf` attribute on a path is meant to mark
upon checkout.
+`ident`
+^^^^^^^
+
+When the attribute `ident` is set to a path, git replaces
+`$ident$` in the blob object with `$ident:`, followed by
+40-character hexadecimal blob object name, followed by a dollar
+sign `$` upon checkout. Any byte sequence that begins with
+`$ident:` and ends with `$` in the worktree file is replaced
+with `$ident$` upon check-in.
+
+
+Interaction between checkin/checkout attributes
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In the check-in codepath, the worktree file is first converted
+with `ident` (if specified), and then with `crlf` (again, if
+specified and applicable).
+
+In the check-out codepath, the blob content is first converted
+with `crlf`, and then `ident`.
+
+
+`filter`
+^^^^^^^^
+
+A `filter` attribute can be set to a string value. This names
+filter driver specified in the configuration.
+
+A filter driver consists of `clean` command and `smudge`
+command, either of which can be left unspecified. Upon
+checkout, when `smudge` command is specified, the command is fed
+the blob object from its standard input, and its standard output
+is used to update the worktree file. Similarly, `clean` command
+is used to convert the contents of worktree file upon checkin.
+
+Missing filter driver definition in the config is not an error
+but makes the filter a no-op passthru.
+
+The content filtering is done to massage the content into a
+shape that is more convenient for the platform, filesystem, and
+the user to use. The keyword here is "more convenient" and not
+"turning something unusable into usable". In other words, it is
+"hanging yourself because we gave you a long rope" if your
+project uses filtering mechanism in such a way that it makes
+your project unusable unless the checkout is done with a
+specific filter in effect.
+
+
+Interaction between checkin/checkout attributes
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In the check-in codepath, the worktree file is first converted
+with `filter` driver (if specified and corresponding driver
+defined), then the result is processed with `ident` (if
+specified), and then finally with `crlf` (again, if specified
+and applicable).
+
+In the check-out codepath, the blob content is first converted
+with `crlf`, and then `ident` and fed to `filter`.
+
+
Generating diff text
~~~~~~~~~~~~~~~~~~~~
projects / git.git / commitdiff