diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-06-28 14:40:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-06-28 14:40:57 -0700 |
commit | ec40f134aa677499a0c1bf7ea6133b7b5fe348c4 (patch) | |
tree | ccfbc4d2f3b9dbf94015ba91975a7166105221f7 /git-apply.html | |
parent | 7578608bd24d16e08ff2c765d8e2aada854fee57 (diff) | |
download | git-htmldocs-ec40f134aa677499a0c1bf7ea6133b7b5fe348c4.tar.gz |
Autogenerated HTML docs for v2.18.0-129-ge3331
Diffstat (limited to 'git-apply.html')
-rw-r--r-- | git-apply.html | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/git-apply.html b/git-apply.html index 82719cf84..a95a4a935 100644 --- a/git-apply.html +++ b/git-apply.html @@ -749,7 +749,7 @@ git-apply(1) Manual Page <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check] [--index] [--3way]
+<pre class="content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
[--allow-binary-replacement | --binary] [--reject] [-z]
[-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
@@ -856,6 +856,19 @@ and does not require them to be in a Git repository.</p></div> </p>
</dd>
<dt class="hdlist1">
+--intent-to-add
+</dt>
+<dd>
+<p>
+ When applying the patch only to the working tree, mark new
+ files to be added to the index later (see <code>--intent-to-add</code>
+ option in <a href="git-add.html">git-add(1)</a>). This option is ignored unless
+ running in a Git repository and <code>--index</code> is not specified.
+ Note that <code>--index</code> could be implied by other options such
+ as <code>--cached</code> or <code>--3way</code>.
+</p>
+</dd>
+<dt class="hdlist1">
-3
</dt>
<dt class="hdlist1">
@@ -1207,7 +1220,7 @@ subdirectory is checked and (if possible) updated.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-05-23 00:06:29 PDT
+ 2018-06-28 14:40:38 PDT
</div>
</div>
</body>
|