diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-05 13:59:51 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 13:59:51 -0700 |
commit | 8fb66e5074d5cdeeb08e304be977374501a0787d (patch) | |
tree | a10c25e0490f7bf43f512b7306ae0d5d50fbba01 /git-revert.html | |
parent | c94277e1611270b68bbf2d52c9679abe231cc459 (diff) | |
download | git-htmldocs-8fb66e5074d5cdeeb08e304be977374501a0787d.tar.gz |
Autogenerated HTML docs for v1.7.7-138-g7f41b6
Diffstat (limited to 'git-revert.html')
-rw-r--r-- | git-revert.html | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/git-revert.html b/git-revert.html index 17bd68ca2..5b33ffadf 100644 --- a/git-revert.html +++ b/git-revert.html @@ -583,7 +583,9 @@ git-revert(1) Manual Page <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="verseblock-content"><em>git revert</em> [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>…</div>
+<div class="verseblock-content"><em>git revert</em> [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>…
+<em>git revert</em> --reset
+<em>git revert</em> --continue</div>
<div class="verseblock-attribution">
</div></div>
</div>
@@ -716,6 +718,31 @@ effect to your index in a row.</p></div> </dd>
</dl></div>
</div>
+<h2 id="_sequencer_subcommands">SEQUENCER SUBCOMMANDS</h2>
+<div class="sectionbody">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+--reset
+</dt>
+<dd>
+<p>
+ Forget about the current operation in progress. Can be used
+ to clear the sequencer state after a failed cherry-pick or
+ revert.
+</p>
+</dd>
+<dt class="hdlist1">
+--continue
+</dt>
+<dd>
+<p>
+ Continue the operation in progress using the information in
+ <em>.git/sequencer</em>. Can be used to continue after resolving
+ conflicts in a failed cherry-pick or revert.
+</p>
+</dd>
+</dl></div>
+</div>
<h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
<div class="dlist"><dl>
@@ -754,7 +781,7 @@ effect to your index in a row.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-09-21 23:01:14 PDT
+Last updated 2011-10-05 13:59:16 PDT
</div>
</div>
</body>
|