diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
commit | eb415999b469f6d3e718f2fdf28dd460d8db5f4f (patch) | |
tree | ca4b12fcea8cc51c42b66ee456255ee4ea85b203 /git-am.html | |
parent | e2b205c118b67a65b1bde35ff88de1f7aceae8d0 (diff) | |
download | git-htmldocs-eb415999b469f6d3e718f2fdf28dd460d8db5f4f.tar.gz |
Autogenerated HTML docs for v1.5.6-rc2-15-g457bb
Diffstat (limited to 'git-am.html')
-rw-r--r-- | git-am.html | 42 |
1 files changed, 33 insertions, 9 deletions
diff --git a/git-am.html b/git-am.html index c39f5e73c..eb6c0c57d 100644 --- a/git-am.html +++ b/git-am.html @@ -299,7 +299,10 @@ current branch.</p> </p>
</dd>
<dt>
--s, --signoff
+-s
+</dt>
+<dt>
+--signoff
</dt>
<dd>
<p>
@@ -308,7 +311,10 @@ current branch.</p> </p>
</dd>
<dt>
--k, --keep
+-k
+</dt>
+<dt>
+--keep
</dt>
<dd>
<p>
@@ -316,7 +322,10 @@ current branch.</p> </p>
</dd>
<dt>
--u, --utf8
+-u
+</dt>
+<dt>
+--utf8
</dt>
<dd>
<p>
@@ -339,7 +348,10 @@ default. You could use <tt>--no-utf8</tt> to override this.</p> </p>
</dd>
<dt>
--3, --3way
+-3
+</dt>
+<dt>
+--3way
</dt>
<dd>
<p>
@@ -350,7 +362,10 @@ default. You could use <tt>--no-utf8</tt> to override this.</p> </p>
</dd>
<dt>
--b, --binary
+-b
+</dt>
+<dt>
+--binary
</dt>
<dd>
<p>
@@ -369,7 +384,10 @@ default. You could use <tt>--no-utf8</tt> to override this.</p> </p>
</dd>
<dt>
--C<n>, -p<n>
+-C<n>
+</dt>
+<dt>
+-p<n>
</dt>
<dd>
<p>
@@ -379,7 +397,10 @@ default. You could use <tt>--no-utf8</tt> to override this.</p> </p>
</dd>
<dt>
--i, --interactive
+-i
+</dt>
+<dt>
+--interactive
</dt>
<dd>
<p>
@@ -396,7 +417,10 @@ default. You could use <tt>--no-utf8</tt> to override this.</p> </p>
</dd>
<dt>
--r, --resolved
+-r
+</dt>
+<dt>
+--resolved
</dt>
<dd>
<p>
@@ -500,7 +524,7 @@ names.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:33:18 UTC
+Last updated 08-Jun-2008 22:46:16 UTC
</div>
</div>
</body>
|