diff options
| author | Junio C Hamano <jch@google.com> | 2012-04-20 16:50:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <jch@google.com> | 2012-04-20 16:50:49 -0700 |
| commit | 0c1b64ec7505c3f5b7ca8e4ccc69a577adb0b814 (patch) | |
| tree | 2efa0be2dc0a2e29a37742d74adb8f0f1ce751a3 /git-am.html | |
| parent | d1ace0ce5ca13c2127191ae769f2af3a4196526a (diff) | |
| download | git-htmldocs-0c1b64ec7505c3f5b7ca8e4ccc69a577adb0b814.tar.gz | |
Autogenerated HTML docs for v1.7.10-227-gd1ca7
Diffstat (limited to 'git-am.html')
| -rw-r--r-- | git-am.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-am.html b/git-am.html index 9f4d8f60e..9277c0326 100644 --- a/git-am.html +++ b/git-am.html @@ -587,7 +587,7 @@ git-am(1) Manual Page [--3way] [--interactive] [--committer-date-is-author-date]
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
- [--exclude=<path>] [--reject] [-q | --quiet]
+ [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
[--scissors | --no-scissors]
[(<mbox> | <Maildir>)…]
<em>git am</em> (--continue | --skip | --abort)</div>
@@ -754,6 +754,9 @@ default. You can use <tt>--no-utf8</tt> to override this.</p></div> --exclude=<path>
</dt>
<dt class="hdlist1">
+--include=<path>
+</dt>
+<dt class="hdlist1">
--reject
</dt>
<dd>
@@ -923,7 +926,7 @@ errors in the "From:" lines).</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-01-29 14:19:30 PDT
+Last updated 2012-04-20 16:50:33 PDT
</div>
</div>
</body>
|