summaryrefslogtreecommitdiffstats
path: root/git-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-06-08 22:49:47 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-06-08 22:49:47 +0000
commiteb415999b469f6d3e718f2fdf28dd460d8db5f4f (patch)
treeca4b12fcea8cc51c42b66ee456255ee4ea85b203 /git-pull.html
parente2b205c118b67a65b1bde35ff88de1f7aceae8d0 (diff)
downloadgit-htmldocs-eb415999b469f6d3e718f2fdf28dd460d8db5f4f.tar.gz
Autogenerated HTML docs for v1.5.6-rc2-15-g457bb
Diffstat (limited to 'git-pull.html')
-rw-r--r--git-pull.html52
1 files changed, 41 insertions, 11 deletions
diff --git a/git-pull.html b/git-pull.html
index 2e1352027..77107a4a3 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -298,7 +298,10 @@ when merging local branches into the current branch.</p>
</p>
</dd>
<dt>
--n, --no-stat
+-n
+</dt>
+<dt>
+--no-stat
</dt>
<dd>
<p>
@@ -306,7 +309,10 @@ when merging local branches into the current branch.</p>
</p>
</dd>
<dt>
---summary, --no-summary
+--summary
+</dt>
+<dt>
+--no-summary
</dt>
<dd>
<p>
@@ -395,7 +401,10 @@ when merging local branches into the current branch.</p>
</p>
</dd>
<dt>
--s &lt;strategy&gt;, --strategy=&lt;strategy&gt;
+-s &lt;strategy&gt;
+</dt>
+<dt>
+--strategy=&lt;strategy&gt;
</dt>
<dd>
<p>
@@ -434,7 +443,10 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</p>
</p>
</dd>
<dt>
--q, --quiet
+-q
+</dt>
+<dt>
+--quiet
</dt>
<dd>
<p>
@@ -443,7 +455,10 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</p>
</p>
</dd>
<dt>
--v, --verbose
+-v
+</dt>
+<dt>
+--verbose
</dt>
<dd>
<p>
@@ -451,7 +466,10 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</p>
</p>
</dd>
<dt>
--a, --append
+-a
+</dt>
+<dt>
+--append
</dt>
<dd>
<p>
@@ -472,7 +490,10 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</p>
</p>
</dd>
<dt>
--f, --force
+-f
+</dt>
+<dt>
+--force
</dt>
<dd>
<p>
@@ -494,7 +515,10 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</p>
</p>
</dd>
<dt>
--t, --tags
+-t
+</dt>
+<dt>
+--tags
</dt>
<dd>
<p>
@@ -507,7 +531,10 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</p>
</p>
</dd>
<dt>
--k, --keep
+-k
+</dt>
+<dt>
+--keep
</dt>
<dd>
<p>
@@ -515,7 +542,10 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</p>
</p>
</dd>
<dt>
--u, --update-head-ok
+-u
+</dt>
+<dt>
+--update-head-ok
</dt>
<dd>
<p>
@@ -1065,7 +1095,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:34:00 UTC
+Last updated 08-Jun-2008 22:46:54 UTC
</div>
</div>
</body>