Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Autogenerated HTML docs for v1.8.1-151-g32238a

  • Loading branch information...
commit abad6da146b5fe8e34f22bcbf31be3cb3e9b08e0 1 parent 0855348
Junio C Hamano authored
45 RelNotes/1.8.2.txt
View
@@ -26,13 +26,49 @@ UI, Workflows & Features
* Output from the tests is coloured using "green is okay, yellow is
questionable, red is bad and blue is informative" scheme.
+ * In bare repositories, "git shortlog" and other commands now read
+ mailmap files from the tip of the history, to help running these
+ tools in server settings.
+
+ * Color specifiers, e.g. "%C(blue)Hello%C(reset)", used in the
+ "--format=" option of "git log" and friends can be disabled when
+ the output is not sent to a terminal by prefixing them with
+ "auto,", e.g. "%C(auto,blue)Hello%C(auto,reset)".
+
+ * Scripts can ask Git that wildcard patterns in pathspecs they give do
+ not have any significance, i.e. take them as literal strings.
+
+ * "git fetch --mirror" and fetch that uses other forms of refspec
+ with wildcard used to attempt to update a symbolic ref that match
+ the wildcard on the receiving end, which made little sense (the
+ real ref that is pointed at by the symbolic ref would be updated
+ anyway). Symbolic refs no longer are affected by such a fetch.
+
+ * "git push" now requires "-f" to update a tag, even if it is a
+ fast-forward, as tags are meant to be fixed points.
+
+ * "git submodule" started learning a new mode to integrate with the
+ tip of the remote branch (as opposed to integrating with the commit
+ recorded in the superproject's gitlink).
+
+
Foreign Interface
- *
+ * "git fast-export" has been updated for its use in the context of
+ the remote helper interface.
+
Performance, Internal Implementation, etc.
- *
+ * "git fsck" has been taught to be pickier about entries in tree
+ objects that should not be there, e.g. ".", ".git", and "..".
+
+ * Matching paths with common forms of pathspecs that contain wildcard
+ characters has been optimized further.
+
+ * The implementation of "imap-send" has been updated to reuse xml
+ quoting code from http-push codepath.
+
Also contains minor documentation updates and code clean-ups.
@@ -71,6 +107,11 @@ details).
pathname was not reported correctly on some platforms.
(merge f7be59b jc/mkstemp-more-careful-error-reporting later to maint).
+ * The attribute mechanism didn't allow limiting attributes to be
+ applied to only a single directory itself with "path/" like the
+ exclude mechanism does.
+ (merge 94bc671 ja/directory-attrs later to maint).
+
* The way "git svn" asked for password using SSH_ASKPASS and
GIT_ASKPASS was not in line with the rest of the system.
(merge e9263e4 ss/svn-prompt later to maint).
24 config.txt
View
@@ -140,10 +140,11 @@ advice.*::
can tell Git that you do not need help by setting these to 'false':
+
--
- pushNonFastForward::
+ pushUpdateRejected::
Set this variable to 'false' if you want to disable
- 'pushNonFFCurrent', 'pushNonFFDefault', and
- 'pushNonFFMatching' simultaneously.
+ 'pushNonFFCurrent', 'pushNonFFDefault',
+ 'pushNonFFMatching', and 'pushAlreadyExists'
+ simultaneously.
pushNonFFCurrent::
Advice shown when linkgit:git-push[1] fails due to a
non-fast-forward update to the current branch.
@@ -158,6 +159,9 @@ advice.*::
'matching refs' explicitly (i.e. you used ':', or
specified a refspec that isn't your current branch) and
it resulted in a non-fast-forward error.
+ pushAlreadyExists::
+ Shown when linkgit:git-push[1] rejects an update that
+ does not qualify for fast-forwarding (e.g., a tag.)
statusHints::
Show directions on how to proceed from the current
state in the output of linkgit:git-status[1], in
@@ -1517,6 +1521,14 @@ mailmap.file::
subdirectory, or somewhere outside of the repository itself.
See linkgit:git-shortlog[1] and linkgit:git-blame[1].
+mailmap.blob::
+ Like `mailmap.file`, but consider the value as a reference to a
+ blob in the repository. If both `mailmap.file` and
+ `mailmap.blob` are given, both are parsed, with entries from
+ `mailmap.file` taking precedence. In a bare repository, this
+ defaults to `HEAD:.mailmap`. In a non-bare repository, it
+ defaults to empty.
+
man.viewer::
Specify the programs that may be used to display help in the
'man' format. See linkgit:git-help[1].
@@ -1995,6 +2007,12 @@ submodule.<name>.update::
URL and other values found in the `.gitmodules` file. See
linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
+submodule.<name>.branch::
+ The remote branch name for a submodule, used by `git submodule
+ update --remote`. Set this option to override the value found in
+ the `.gitmodules` file. See linkgit:git-submodule[1] and
+ linkgit:gitmodules[5] for details.
+
submodule.<name>.fetchRecurseSubmodules::
This option can be used to control recursive fetching of this
submodule. It can be overridden by using the --[no-]recurse-submodules
3  git-blame.html
View
@@ -1263,7 +1263,8 @@ <h2 id="_incremental_output">INCREMENTAL OUTPUT</h2>
<h2 id="_mapping_authors">MAPPING AUTHORS</h2>
<div class="sectionbody">
<div class="paragraph"><p>If the file <code>.mailmap</code> exists at the toplevel of the repository, or at
-the location pointed to by the mailmap.file configuration option, it
+the location pointed to by the mailmap.file or mailmap.blob
+configuration options, it
is used to map author and committer names and email addresses to
canonical real names and email addresses.</p></div>
<div class="paragraph"><p>In the simple form, each line in the file consists of the canonical
40 git-config.html
View
@@ -1399,13 +1399,14 @@ <h3 id="_variables">Variables</h3>
<div class="content">
<div class="dlist"><dl>
<dt class="hdlist1">
-pushNonFastForward
+pushUpdateRejected
</dt>
<dd>
<p>
Set this variable to <em>false</em> if you want to disable
- <em>pushNonFFCurrent</em>, <em>pushNonFFDefault</em>, and
- <em>pushNonFFMatching</em> simultaneously.
+ <em>pushNonFFCurrent</em>, <em>pushNonFFDefault</em>,
+ <em>pushNonFFMatching</em>, and <em>pushAlreadyExists</em>
+ simultaneously.
</p>
</dd>
<dt class="hdlist1">
@@ -1441,6 +1442,15 @@ <h3 id="_variables">Variables</h3>
</p>
</dd>
<dt class="hdlist1">
+pushAlreadyExists
+</dt>
+<dd>
+<p>
+ Shown when <a href="git-push.html">git-push(1)</a> rejects an update that
+ does not qualify for fast-forwarding (e.g., a tag.)
+</p>
+</dd>
+<dt class="hdlist1">
statusHints
</dt>
<dd>
@@ -4137,6 +4147,19 @@ <h3 id="_variables">Variables</h3>
</p>
</dd>
<dt class="hdlist1">
+mailmap.blob
+</dt>
+<dd>
+<p>
+ Like <code>mailmap.file</code>, but consider the value as a reference to a
+ blob in the repository. If both <code>mailmap.file</code> and
+ <code>mailmap.blob</code> are given, both are parsed, with entries from
+ <code>mailmap.file</code> taking precedence. In a bare repository, this
+ defaults to <code>HEAD:.mailmap</code>. In a non-bare repository, it
+ defaults to empty.
+</p>
+</dd>
+<dt class="hdlist1">
man.viewer
</dt>
<dd>
@@ -5152,6 +5175,17 @@ <h3 id="_variables">Variables</h3>
</p>
</dd>
<dt class="hdlist1">
+submodule.&lt;name&gt;.branch
+</dt>
+<dd>
+<p>
+ The remote branch name for a submodule, used by <code>git submodule
+ update --remote</code>. Set this option to override the value found in
+ the <code>.gitmodules</code> file. See <a href="git-submodule.html">git-submodule(1)</a> and
+ <a href="gitmodules.html">gitmodules(5)</a> for details.
+</p>
+</dd>
+<dt class="hdlist1">
submodule.&lt;name&gt;.fetchRecurseSubmodules
</dt>
<dd>
6 git-diff-tree.html
View
@@ -2178,7 +2178,11 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
</li>
<li>
<p>
-<em>%C(&#8230;)</em>: color specification, as described in color.branch.* config option
+<em>%C(&#8230;)</em>: color specification, as described in color.branch.* config option;
+ adding <code>auto,</code> at the beginning will emit color only when colors are
+ enabled for log output (by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and
+ respecting the <code>auto</code> settings of the former if we are going to a
+ terminal)
</p>
</li>
<li>
10 git-log.html
View
@@ -2389,7 +2389,11 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
</li>
<li>
<p>
-<em>%C(&#8230;)</em>: color specification, as described in color.branch.* config option
+<em>%C(&#8230;)</em>: color specification, as described in color.branch.* config option;
+ adding <code>auto,</code> at the beginning will emit color only when colors are
+ enabled for log output (by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and
+ respecting the <code>auto</code> settings of the former if we are going to a
+ terminal)
</p>
</li>
<li>
@@ -3673,7 +3677,7 @@ <h2 id="_configuration">Configuration</h2>
</p>
</dd>
<dt class="hdlist1">
-mailmap.file
+mailmap.*
</dt>
<dd>
<p>
@@ -3710,7 +3714,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-09-12 15:56:23 PDT
+Last updated 2013-01-06 01:05:36 PST
</div>
</div>
</body>
2  git-log.txt
View
@@ -167,7 +167,7 @@ log.showroot::
`git log -p` output would be shown without a diff attached.
The default is `true`.
-mailmap.file::
+mailmap.*::
See linkgit:git-shortlog[1].
notes.displayRef::
11 git-push.html
View
@@ -799,10 +799,11 @@ <h2 id="_options_a_id_options_a">OPTIONS<a id="OPTIONS"></a></h2>
be named. If <code>:</code>&lt;dst&gt; is omitted, the same ref as &lt;src&gt; will be
updated.</p></div>
<div class="paragraph"><p>The object referenced by &lt;src&gt; is used to update the &lt;dst&gt; reference
-on the remote side, but by default this is only allowed if the
-update can fast-forward &lt;dst&gt;. By having the optional leading <code>+</code>,
-you can tell git to update the &lt;dst&gt; ref even when the update is not a
-fast-forward. This does <strong>not</strong> attempt to merge &lt;src&gt; into &lt;dst&gt;. See
+on the remote side. By default this is only allowed if &lt;dst&gt; is not
+a tag (annotated or lightweight), and then only if it can fast-forward
+&lt;dst&gt;. By having the optional leading <code>+</code>, you can tell git to update
+the &lt;dst&gt; ref even if it is not allowed by default (e.g., it is not a
+fast-forward.) This does <strong>not</strong> attempt to merge &lt;src&gt; into &lt;dst&gt;. See
EXAMPLES below for details.</p></div>
<div class="paragraph"><p><code>tag &lt;tag&gt;</code> means the same as <code>refs/tags/&lt;tag&gt;:refs/tags/&lt;tag&gt;</code>.</p></div>
<div class="paragraph"><p>Pushing an empty &lt;src&gt; allows you to delete the &lt;dst&gt; ref from
@@ -1630,7 +1631,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-11-29 14:50:58 PST
+Last updated 2013-01-06 01:05:36 PST
</div>
</div>
</body>
9 git-push.txt
View
@@ -51,10 +51,11 @@ be named. If `:`<dst> is omitted, the same ref as <src> will be
updated.
+
The object referenced by <src> is used to update the <dst> reference
-on the remote side, but by default this is only allowed if the
-update can fast-forward <dst>. By having the optional leading `+`,
-you can tell git to update the <dst> ref even when the update is not a
-fast-forward. This does *not* attempt to merge <src> into <dst>. See
+on the remote side. By default this is only allowed if <dst> is not
+a tag (annotated or lightweight), and then only if it can fast-forward
+<dst>. By having the optional leading `+`, you can tell git to update
+the <dst> ref even if it is not allowed by default (e.g., it is not a
+fast-forward.) This does *not* attempt to merge <src> into <dst>. See
EXAMPLES below for details.
+
`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
4 git-remote-testgit.html
View
@@ -758,7 +758,7 @@ <h2 id="_description">DESCRIPTION</h2>
testcase for the remote-helper functionality, and as an example to
show remote-helper authors one possible implementation.</p></div>
<div class="paragraph"><p>The best way to learn more is to read the comments and source code in
-<em>git-remote-testgit.py</em>.</p></div>
+<em>git-remote-testgit</em>.</p></div>
</div>
</div>
<div class="sect1">
@@ -777,7 +777,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PST
+Last updated 2013-01-06 01:05:36 PST
</div>
</div>
</body>
2  git-remote-testgit.txt
View
@@ -19,7 +19,7 @@ testcase for the remote-helper functionality, and as an example to
show remote-helper authors one possible implementation.
The best way to learn more is to read the comments and source code in
-'git-remote-testgit.py'.
+'git-remote-testgit'.
SEE ALSO
--------
6 git-rev-list.html
View
@@ -2429,7 +2429,11 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
</li>
<li>
<p>
-<em>%C(&#8230;)</em>: color specification, as described in color.branch.* config option
+<em>%C(&#8230;)</em>: color specification, as described in color.branch.* config option;
+ adding <code>auto,</code> at the beginning will emit color only when colors are
+ enabled for log output (by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and
+ respecting the <code>auto</code> settings of the former if we are going to a
+ terminal)
</p>
</li>
<li>
3  git-shortlog.html
View
@@ -849,7 +849,8 @@ <h2 id="_mapping_authors">MAPPING AUTHORS</h2>
person in the shortlog, where their name and/or email address was
spelled differently.</p></div>
<div class="paragraph"><p>If the file <code>.mailmap</code> exists at the toplevel of the repository, or at
-the location pointed to by the mailmap.file configuration option, it
+the location pointed to by the mailmap.file or mailmap.blob
+configuration options, it
is used to map author and committer names and email addresses to
canonical real names and email addresses.</p></div>
<div class="paragraph"><p>In the simple form, each line in the file consists of the canonical
6 git-show.html
View
@@ -1273,7 +1273,11 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
</li>
<li>
<p>
-<em>%C(&#8230;)</em>: color specification, as described in color.branch.* config option
+<em>%C(&#8230;)</em>: color specification, as described in color.branch.* config option;
+ adding <code>auto,</code> at the beginning will emit color only when colors are
+ enabled for log output (by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and
+ respecting the <code>auto</code> settings of the former if we are going to a
+ terminal)
</p>
</li>
<li>
30 git-submodule.html
View
@@ -750,7 +750,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
[--reference &lt;repository&gt;] [--] &lt;repository&gt; [&lt;path&gt;]
<em>git submodule</em> [--quiet] status [--cached] [--recursive] [--] [&lt;path&gt;&#8230;]
<em>git submodule</em> [--quiet] init [--] [&lt;path&gt;&#8230;]
-<em>git submodule</em> [--quiet] update [--init] [-N|--no-fetch] [--rebase]
+<em>git submodule</em> [--quiet] update [--init] [--remote] [-N|--no-fetch] [--rebase]
[--reference &lt;repository&gt;] [--merge] [--recursive] [--] [&lt;path&gt;&#8230;]
<em>git submodule</em> [--quiet] summary [--cached|--files] [(-n|--summary-limit) &lt;n&gt;]
[commit] [--] [&lt;path&gt;&#8230;]
@@ -988,6 +988,8 @@ <h2 id="_options">OPTIONS</h2>
<dd>
<p>
Branch of repository to add as submodule.
+ The name of the branch is recorded as <code>submodule.&lt;path&gt;.branch</code> in
+ <code>.gitmodules</code> for <code>update --remote</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1042,6 +1044,30 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
+--remote
+</dt>
+<dd>
+<p>
+ This option is only valid for the update command. Instead of using
+ the superproject&#8217;s recorded SHA-1 to update the submodule, use the
+ status of the submodule&#8217;s remote tracking branch. The remote used
+ is branch&#8217;s remote (<code>branch.&lt;name&gt;.remote</code>), defaulting to <code>origin</code>.
+ The remote branch used defaults to <code>master</code>, but the branch name may
+ be overridden by setting the <code>submodule.&lt;name&gt;.branch</code> option in
+ either <code>.gitmodules</code> or <code>.git/config</code> (with <code>.git/config</code> taking
+ precedence).
+</p>
+<div class="paragraph"><p>This works for any of the supported update procedures (<code>--checkout</code>,
+<code>--rebase</code>, etc.). The only change is the source of the target SHA-1.
+For example, <code>submodule update --remote --merge</code> will merge upstream
+submodule changes into the submodules, while <code>submodule update
+--merge</code> will merge superproject gitlink changes into the submodules.</p></div>
+<div class="paragraph"><p>In order to ensure a current tracking branch state, <code>update --remote</code>
+fetches the submodule&#8217;s remote repository before calculating the
+SHA-1. If you don&#8217;t want to fetch, you should use <code>submodule update
+--remote --no-fetch</code>.</p></div>
+</dd>
+<dt class="hdlist1">
-N
</dt>
<dt class="hdlist1">
@@ -1158,7 +1184,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-11-21 13:58:35 PST
+Last updated 2013-01-06 01:05:36 PST
</div>
</div>
</body>
25 git-submodule.txt
View
@@ -13,7 +13,7 @@ SYNOPSIS
[--reference <repository>] [--] <repository> [<path>]
'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]
'git submodule' [--quiet] init [--] [<path>...]
-'git submodule' [--quiet] update [--init] [-N|--no-fetch] [--rebase]
+'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch] [--rebase]
[--reference <repository>] [--merge] [--recursive] [--] [<path>...]
'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>]
[commit] [--] [<path>...]
@@ -208,6 +208,8 @@ OPTIONS
-b::
--branch::
Branch of repository to add as submodule.
+ The name of the branch is recorded as `submodule.<path>.branch` in
+ `.gitmodules` for `update --remote`.
-f::
--force::
@@ -236,6 +238,27 @@ OPTIONS
(the default). This limit only applies to modified submodules. The
size is always limited to 1 for added/deleted/typechanged submodules.
+--remote::
+ This option is only valid for the update command. Instead of using
+ the superproject's recorded SHA-1 to update the submodule, use the
+ status of the submodule's remote tracking branch. The remote used
+ is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
+ The remote branch used defaults to `master`, but the branch name may
+ be overridden by setting the `submodule.<name>.branch` option in
+ either `.gitmodules` or `.git/config` (with `.git/config` taking
+ precedence).
++
+This works for any of the supported update procedures (`--checkout`,
+`--rebase`, etc.). The only change is the source of the target SHA-1.
+For example, `submodule update --remote --merge` will merge upstream
+submodule changes into the submodules, while `submodule update
+--merge` will merge superproject gitlink changes into the submodules.
++
+In order to ensure a current tracking branch state, `update --remote`
+fetches the submodule's remote repository before calculating the
+SHA-1. If you don't want to fetch, you should use `submodule update
+--remote --no-fetch`.
+
-N::
--no-fetch::
This option is only valid for the update command.
6 git-whatchanged.html
View
@@ -1305,7 +1305,11 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
</li>
<li>
<p>
-<em>%C(&#8230;)</em>: color specification, as described in color.branch.* config option
+<em>%C(&#8230;)</em>: color specification, as described in color.branch.* config option;
+ adding <code>auto,</code> at the beginning will emit color only when colors are
+ enabled for log output (by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and
+ respecting the <code>auto</code> settings of the former if we are going to a
+ terminal)
</p>
</li>
<li>
26 git.html
View
@@ -923,6 +923,16 @@ <h2 id="_options">OPTIONS</h2>
<a href="git-replace.html">git-replace(1)</a> for more information.
</p>
</dd>
+<dt class="hdlist1">
+--literal-pathspecs
+</dt>
+<dd>
+<p>
+ Treat pathspecs literally, rather than as glob patterns. This is
+ equivalent to setting the <code>GIT_LITERAL_PATHSPECS</code> environment
+ variable to <code>1</code>.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -2581,6 +2591,20 @@ <h3 id="_other">other</h3>
into it.
</p>
</dd>
+<dt class="hdlist1">
+GIT_LITERAL_PATHSPECS
+</dt>
+<dd>
+<p>
+ Setting this variable to <code>1</code> will cause git to treat all
+ pathspecs literally, rather than as glob patterns. For example,
+ running <code>GIT_LITERAL_PATHSPECS=1 git log -- '*.c'</code> will search
+ for commits that touch the path <code>*.c</code>, not any paths that the
+ glob <code>*.c</code> matches. You might want this if you are feeding
+ literal paths to git (e.g., paths previously given to you by
+ <code>git ls-tree</code>, <code>--raw</code> diff output, etc).
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -2689,7 +2713,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-12-31 16:05:13 PST
+Last updated 2013-01-06 01:05:36 PST
</div>
</div>
</body>
15 git.txt
View
@@ -428,6 +428,11 @@ help ...`.
Do not use replacement refs to replace git objects. See
linkgit:git-replace[1] for more information.
+--literal-pathspecs::
+ Treat pathspecs literally, rather than as glob patterns. This is
+ equivalent to setting the `GIT_LITERAL_PATHSPECS` environment
+ variable to `1`.
+
GIT COMMANDS
------------
@@ -796,6 +801,16 @@ for further details.
as a file path and will try to write the trace messages
into it.
+GIT_LITERAL_PATHSPECS::
+ Setting this variable to `1` will cause git to treat all
+ pathspecs literally, rather than as glob patterns. For example,
+ running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search
+ for commits that touch the path `*.c`, not any paths that the
+ glob `*.c` matches. You might want this if you are feeding
+ literal paths to git (e.g., paths previously given to you by
+ `git ls-tree`, `--raw` diff output, etc).
+
+
Discussion[[Discussion]]
------------------------
12 gitmodules.html
View
@@ -804,6 +804,16 @@ <h2 id="_description">DESCRIPTION</h2>
</div></div>
</dd>
<dt class="hdlist1">
+submodule.&lt;name&gt;.branch
+</dt>
+<dd>
+<p>
+ A remote branch name for tracking updates in the upstream submodule.
+ If the option is not specified, it defaults to <em>master</em>. See the
+ <code>--remote</code> documentation in <a href="git-submodule.html">git-submodule(1)</a> for details.
+</p>
+</dd>
+<dt class="hdlist1">
submodule.&lt;name&gt;.fetchRecurseSubmodules
</dt>
<dd>
@@ -876,7 +886,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-11-13 14:31:09 PST
+Last updated 2013-01-06 01:05:36 PST
</div>
</div>
</body>
5 gitmodules.txt
View
@@ -49,6 +49,11 @@ submodule.<name>.update::
This config option is overridden if 'git submodule update' is given
the '--merge', '--rebase' or '--checkout' options.
+submodule.<name>.branch::
+ A remote branch name for tracking updates in the upstream submodule.
+ If the option is not specified, it defaults to 'master'. See the
+ `--remote` documentation in linkgit:git-submodule[1] for details.
+
submodule.<name>.fetchRecurseSubmodules::
This option can be used to control recursive fetching of this
submodule. If this option is also present in the submodules entry in
3  mailmap.txt
View
@@ -1,5 +1,6 @@
If the file `.mailmap` exists at the toplevel of the repository, or at
-the location pointed to by the mailmap.file configuration option, it
+the location pointed to by the mailmap.file or mailmap.blob
+configuration options, it
is used to map author and committer names and email addresses to
canonical real names and email addresses.
6 pretty-formats.txt
View
@@ -144,7 +144,11 @@ The placeholders are:
- '%Cgreen': switch color to green
- '%Cblue': switch color to blue
- '%Creset': reset color
-- '%C(...)': color specification, as described in color.branch.* config option
+- '%C(...)': color specification, as described in color.branch.* config option;
+ adding `auto,` at the beginning will emit color only when colors are
+ enabled for log output (by `color.diff`, `color.ui`, or `--color`, and
+ respecting the `auto` settings of the former if we are going to a
+ terminal)
- '%m': left, right or boundary mark
- '%n': newline
- '%%': a raw '%'
Please sign in to comment.
Something went wrong with that request. Please try again.