<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
<div class="verseblock">\r
-<div class="content"><em>git-am</em> [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>…\r
+<div class="content"><em>git-am</em> [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]\r
+ [--interactive] [--whitespace=<option>] <mbox>…\r
<em>git-am</em> [--skip | --resolved]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
</p>\r
</dd>\r
<dt>\r
+--whitespace=<option>\r
+</dt>\r
+<dd>\r
+<p>\r
+ This flag is passed to the <tt>git-apply</tt> program that applies\r
+ the patch.\r
+</p>\r
+</dd>\r
+<dt>\r
--interactive\r
</dt>\r
<dd>\r
</div>\r
<h2>SEE ALSO</h2>\r
<div class="sectionbody">\r
-<p><a href="git-applymbox.html">git-applymbox(1)</a>, <a href="git-applypatch.html">git-applypatch(1)</a>.</p>\r
+<p><a href="git-applymbox.html">git-applymbox(1)</a>, <a href="git-applypatch.html">git-applypatch(1)</a>, <a href="git-apply.html">git-apply(1)</a>.</p>\r
</div>\r
<h2>Author</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-Jan-2006 17:11:59 PDT\r
+Last updated 02-Mar-2006 09:14:47 UTC\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
[verse]
-'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>...
+'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
+ [--interactive] [--whitespace=<option>] <mbox>...
'git-am' [--skip | --resolved]
DESCRIPTION
Skip the current patch. This is only meaningful when
restarting an aborted patch.
+--whitespace=<option>::
+ This flag is passed to the `git-apply` program that applies
+ the patch.
+
--interactive::
Run interactively, just like git-applymbox.
SEE ALSO
--------
-gitlink:git-applymbox[1], gitlink:git-applypatch[1].
+gitlink:git-applymbox[1], gitlink:git-applypatch[1], gitlink:git-apply[1].
Author
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
<div class="verseblock">\r
<div class="content"><em>git-apply</em> [--stat] [--numstat] [--summary] [--check] [--index] [--apply]\r
[--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM]\r
+ [--whitespace=<nowarn|warn|error|error-all|strip>]\r
[<patch>…]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
very limited way.\r
</p>\r
</dd>\r
+<dt>\r
+--whitespace=<option>\r
+</dt>\r
+<dd>\r
+<p>\r
+ When applying a patch, detect a new or modified line\r
+ that ends with trailing whitespaces (this includes a\r
+ line that solely consists of whitespaces). By default,\r
+ the command outputs warning messages and applies the\r
+ patch.\r
+ When <tt>git-apply</tt> is used for statistics and not applying a\r
+ patch, it defaults to <tt>nowarn</tt>.\r
+ You can use different <tt><option></tt> to control this\r
+ behaviour:\r
+</p>\r
+<ul>\r
+<li>\r
+<p>\r
+<tt>nowarn</tt> turns off the trailing whitespace warning.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<tt>warn</tt> outputs warnings for a few such errors, but applies the\r
+ patch (default).\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<tt>error</tt> outputs warnings for a few such errors, and refuses\r
+ to apply the patch.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<tt>error-all</tt> is similar to <tt>error</tt> but shows all errors.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<tt>strip</tt> outputs warnings for a few such errors, strips out the\r
+ trailing whitespaces and applies the patch.\r
+</p>\r
+</li>\r
+</ul>\r
+</dd>\r
+</dl>\r
+</div>\r
+<h2>Configuration</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+apply.whitespace\r
+</dt>\r
+<dd>\r
+<p>\r
+ When no <tt>--whitespace</tt> flag is given from the command\r
+ line, this configuration item is used as the default.\r
+</p>\r
+</dd>\r
</dl>\r
</div>\r
<h2>Author</h2>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 31-Jan-2006 16:58:56 PDT\r
+Last updated 02-Mar-2006 09:14:48 UTC\r
</div>\r
</div>\r
</body>\r
[verse]
'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply]
[--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM]
+ [--whitespace=<nowarn|warn|error|error-all|strip>]
[<patch>...]
DESCRIPTION
result. This allows binary files to be patched in a
very limited way.
+--whitespace=<option>::
+ When applying a patch, detect a new or modified line
+ that ends with trailing whitespaces (this includes a
+ line that solely consists of whitespaces). By default,
+ the command outputs warning messages and applies the
+ patch.
+ When `git-apply` is used for statistics and not applying a
+ patch, it defaults to `nowarn`.
+ You can use different `<option>` to control this
+ behaviour:
++
+* `nowarn` turns off the trailing whitespace warning.
+* `warn` outputs warnings for a few such errors, but applies the
+ patch (default).
+* `error` outputs warnings for a few such errors, and refuses
+ to apply the patch.
+* `error-all` is similar to `error` but shows all errors.
+* `strip` outputs warnings for a few such errors, strips out the
+ trailing whitespaces and applies the patch.
+
+
+Configuration
+-------------
+
+apply.whitespace::
+ When no `--whitespace` flag is given from the command
+ line, this configuration item is used as the default.
+
+
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-read-tree</em> (<tree-ish> | [[-m | --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])</p>\r
+<p><em>git-read-tree</em> (<tree-ish> | [[-m [--aggressive]| --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])</p>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</p>\r
</dd>\r
<dt>\r
+--aggressive\r
+</dt>\r
+<dd>\r
+<p>\r
+ Usually a three-way merge by <tt>git-read-tree</tt> resolves\r
+ the merge for really trivial cases and leaves other\r
+ cases unresolved in the index, so that Porcelains can\r
+ implement different merge policies. This flag makes the\r
+ command to resolve a few more cases internally:\r
+</p>\r
+<ul>\r
+<li>\r
+<p>\r
+when one side removes a path and the other side leaves the path\r
+ unmodified. The resolution is to remove that path.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+when both sides remove a path. The resolution is to remove that path.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+when both sides adds a path identically. The resolution\r
+ is to add that path.\r
+</p>\r
+</li>\r
+</ul>\r
+</dd>\r
+<dt>\r
<tree-ish#>\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:31 PDT\r
+Last updated 02-Mar-2006 09:14:48 UTC\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-read-tree' (<tree-ish> | [[-m | --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
+'git-read-tree' (<tree-ish> | [[-m [--aggressive]| --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
DESCRIPTION
trees that are not directly related to the current
working tree status into a temporary index file.
+--aggressive::
+ Usually a three-way merge by `git-read-tree` resolves
+ the merge for really trivial cases and leaves other
+ cases unresolved in the index, so that Porcelains can
+ implement different merge policies. This flag makes the
+ command to resolve a few more cases internally:
++
+* when one side removes a path and the other side leaves the path
+ unmodified. The resolution is to remove that path.
+* when both sides remove a path. The resolution is to remove that path.
+* when both sides adds a path identically. The resolution
+ is to add that path.
+
<tree-ish#>::
The id of the tree object(s) to be read/merged.
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
[ --all ]\r
[ [ --merge-order [ --show-breaks ] ] | [ --topo-order ] ]\r
[ --parents ]\r
- [ --objects [ --unpacked ] ]\r
+ [ [--objects | --objects-edge] [ --unpacked ] ]\r
[ --pretty | --header ]\r
[ --bisect ]\r
<commit>… [ -- <paths>… ]</div></div>\r
</p>\r
</dd>\r
<dt>\r
+--objects-edge\r
+</dt>\r
+<dd>\r
+<p>\r
+ Similar to <tt>--objects</tt>, but also print the IDs of\r
+ excluded commits refixed with a <tt>-</tt> character. This is\r
+ used by <tt>git-pack-objects</tt> to build <em>thin</em> pack, which\r
+ records objects in deltified form based on objects\r
+ contained in these excluded commits to reduce network\r
+ traffic.\r
+</p>\r
+</dd>\r
+<dt>\r
--unpacked\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 28-Jan-2006 00:54:44 PDT\r
+Last updated 02-Mar-2006 09:14:49 UTC\r
</div>\r
</div>\r
</body>\r
[ \--all ]
[ [ \--merge-order [ \--show-breaks ] ] | [ \--topo-order ] ]
[ \--parents ]
- [ \--objects [ \--unpacked ] ]
+ [ [\--objects | \--objects-edge] [ \--unpacked ] ]
[ \--pretty | \--header ]
[ \--bisect ]
<commit>... [ \-- <paths>... ]
which I need to download if I have the commit object 'bar', but
not 'foo'".
+--objects-edge::
+ Similar to `--objects`, but also print the IDs of
+ excluded commits refixed with a `-` character. This is
+ used by `git-pack-objects` to build 'thin' pack, which
+ records objects in deltified form based on objects
+ contained in these excluded commits to reduce network
+ traffic.
+
--unpacked::
Only useful with `--objects`; print the object IDs that
are not in packs.
projects / git.git / commitdiff