this option, `git pull` defaults to merge the first refspec fetched.
Specify multiple values to get an octopus merge.
-pager.color::
+color.pager::
A boolean to enable/disable colored output when the pager is in
use (default is true).
-diff.color::
+color.diff::
When true (or `always`), always use colors in patch.
When false (or `never`), never. When set to `auto`, use
colors only when the output is to the terminal.
-diff.color.<slot>::
+color.diff.<slot>::
Use customized color for diff colorization. `<slot>`
specifies which part of the patch to use the specified
color, and is one of `plain` (context text), `meta`
The default set of branches for gitlink:git-show-branch[1].
See gitlink:git-show-branch[1].
-status.color::
+color.status::
A boolean to enable/disable color in the output of
gitlink:git-status[1]. May be set to `true` (or `always`),
`false` (or `never`) or `auto`, in which case colors are used
only when the output is to a terminal. Defaults to false.
-status.color.<slot>::
+color.status.<slot>::
Use customized color for status colorization. `<slot>` is
one of `header` (the header text of the status message),
`updated` (files which are updated but not committed),
`changed` (files which are changed but not updated in the index),
or `untracked` (files which are not tracked by git). The values of
- these variables may be specified as in diff.color.<slot>.
+ these variables may be specified as in color.diff.<slot>.
tar.umask::
By default, gitlink:git-tar-tree[1] sets file and directories modes
corresponding remotes file---see below), then all the\r
refs that exist both on the local side and on the remote\r
side are updated.</p>\r
-<p>Some short-cut notations are also supported.</p>\r
-<ul>\r
-<li>\r
-<p>\r
-<tt>tag <tag></tt> means the same as <tt>refs/tags/<tag>:refs/tags/<tag></tt>.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-A parameter <ref> without a colon is equivalent to\r
- <ref><tt>:</tt><ref>, hence updates <ref> in the destination from <ref>\r
- in the source.\r
-</p>\r
-</li>\r
-</ul>\r
+<p><tt>tag <tag></tt> means the same as <tt>refs/tags/<tag>:refs/tags/<tag></tt>.</p>\r
+<p>A parameter <ref> without a colon is equivalent to\r
+<ref><tt>:</tt><ref>, hence updates <ref> in the destination from <ref>\r
+in the source.</p>\r
+<p>Pushing an empty <src> allows you to delete the <dst> ref from\r
+the remote repository.</p>\r
</dd>\r
<dt>\r
--all\r
</div>\r
<h2>Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Junio C Hamano <junkio@cox.net></p>\r
+<p>Written by Junio C Hamano <junkio@cox.net>, later rewritten in C\r
+by Linus Torvalds <torvalds@osdl.org></p>\r
</div>\r
<h2>Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 24-Oct-2006 05:44:00 UTC\r
+Last updated 13-Dec-2006 10:14:07 UTC\r
</div>\r
</div>\r
</body>\r
refs that exist both on the local side and on the remote
side are updated.
+
-Some short-cut notations are also supported.
+`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
+
-* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
-* A parameter <ref> without a colon is equivalent to
- <ref>`:`<ref>, hence updates <ref> in the destination from <ref>
- in the source.
+A parameter <ref> without a colon is equivalent to
+<ref>`:`<ref>, hence updates <ref> in the destination from <ref>
+in the source.
++
+Pushing an empty <src> allows you to delete the <dst> ref from
+the remote repository.
\--all::
Instead of naming each ref to push, specifies that all
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <junkio@cox.net>, later rewritten in C
+by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
</p>\r
</dd>\r
<dt>\r
-pager.color\r
+color.pager\r
</dt>\r
<dd>\r
<p>\r
</p>\r
</dd>\r
<dt>\r
-diff.color\r
+color.diff\r
</dt>\r
<dd>\r
<p>\r
</p>\r
</dd>\r
<dt>\r
-diff.color.<slot>\r
+color.diff.<slot>\r
</dt>\r
<dd>\r
<p>\r
</p>\r
</dd>\r
<dt>\r
-status.color\r
+color.status\r
</dt>\r
<dd>\r
<p>\r
</p>\r
</dd>\r
<dt>\r
-status.color.<slot>\r
+color.status.<slot>\r
</dt>\r
<dd>\r
<p>\r
<tt>updated</tt> (files which are updated but not committed),\r
<tt>changed</tt> (files which are changed but not updated in the index),\r
or <tt>untracked</tt> (files which are not tracked by git). The values of\r
- these variables may be specified as in diff.color.<slot>.\r
+ these variables may be specified as in color.diff.<slot>.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 09-Dec-2006 21:15:37 UTC\r
+Last updated 13-Dec-2006 10:14:08 UTC\r
</div>\r
</div>\r
</body>\r
projects / git.git / commitdiff