diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-04-17 08:28:11 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-04-17 08:28:11 +0000 |
| commit | 0e3cb537e5dee1347d53fc91ed855a1e84127503 (patch) | |
| tree | 96798e6364c62384423f5a2490c9630dfea97a60 /git-am.html | |
| parent | 29ee16327f63eaf6dfd0a3348669ea607e921032 (diff) | |
| download | git-htmldocs-0e3cb537e5dee1347d53fc91ed855a1e84127503.tar.gz | |
Autogenerated HTML docs for v1.5.1.1-135-gf948
Diffstat (limited to 'git-am.html')
| -rw-r--r-- | git-am.html | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/git-am.html b/git-am.html index a41714cc0..f2a433f82 100644 --- a/git-am.html +++ b/git-am.html @@ -297,7 +297,7 @@ current branch.</p> </p>
</dd>
<dt>
---signoff
+-s, --signoff
</dt>
<dd>
<p>
@@ -306,7 +306,7 @@ current branch.</p> </p>
</dd>
<dt>
---dotest=<dir>
+-d=<dir>, --dotest=<dir>
</dt>
<dd>
<p>
@@ -315,7 +315,7 @@ current branch.</p> </p>
</dd>
<dt>
---keep
+-k, --keep
</dt>
<dd>
<p>
@@ -323,7 +323,7 @@ current branch.</p> </p>
</dd>
<dt>
---utf8
+-u, --utf8
</dt>
<dd>
<p>
@@ -341,12 +341,12 @@ default. You could use <tt>--no-utf8</tt> to override this.</p> </dt>
<dd>
<p>
- Do not pass <tt>-u</tt> flag to <tt>git-mailinfo</tt> (see
+ Pass <tt>-n</tt> flag to <tt>git-mailinfo</tt> (see
<a href="git-mailinfo.html">git-mailinfo(1)</a>).
</p>
</dd>
<dt>
---binary
+-b, --binary
</dt>
<dd>
<p>
@@ -355,7 +355,7 @@ default. You could use <tt>--no-utf8</tt> to override this.</p> </p>
</dd>
<dt>
---3way
+-3, --3way
</dt>
<dd>
<p>
@@ -393,7 +393,7 @@ default. You could use <tt>--no-utf8</tt> to override this.</p> </p>
</dd>
<dt>
---interactive
+-i, --interactive
</dt>
<dd>
<p>
@@ -401,7 +401,7 @@ default. You could use <tt>--no-utf8</tt> to override this.</p> </p>
</dd>
<dt>
---resolved
+-r, --resolved
</dt>
<dd>
<p>
@@ -413,6 +413,18 @@ default. You could use <tt>--no-utf8</tt> to override this.</p> file, and continue.
</p>
</dd>
+<dt>
+--resolvemsg=<msg>
+</dt>
+<dd>
+<p>
+ When a patch failure occurs, <msg> will be printed
+ to the screen before exiting. This overrides the
+ standard message informing you to use <tt>--resolved</tt>
+ or <tt>--skip</tt> to handle the failure. This is solely
+ for internal use between <tt>git-rebase</tt> and <tt>git-am</tt>.
+</p>
+</dd>
</dl>
</div>
<h2>DISCUSSION</h2>
@@ -494,7 +506,7 @@ names.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 04-Apr-2007 18:33:22 UTC
+Last updated 17-Apr-2007 08:27:39 UTC
</div>
</div>
</body>
|