diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-02-10 02:05:29 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-02-10 02:05:29 +0000 |
| commit | 23e3f53f79f5a2ae39b9db36901df9cb8e3d8901 (patch) | |
| tree | b8ab0b27196b4f13dd256bf1b1ef4b5063f09012 /git-revert.html | |
| parent | e611683c24e33fcc90bfc93d80eba2d5c5622fc7 (diff) | |
| download | git-htmldocs-23e3f53f79f5a2ae39b9db36901df9cb8e3d8901.tar.gz | |
Autogenerated HTML docs for v1.7.4-45-g1a9f
Diffstat (limited to 'git-revert.html')
| -rw-r--r-- | git-revert.html | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/git-revert.html b/git-revert.html index 08f44375a..79137411f 100644 --- a/git-revert.html +++ b/git-revert.html @@ -521,6 +521,28 @@ effect to your index in a row.</p></div> Add Signed-off-by line at the end of the commit message.
</p>
</dd>
+<dt class="hdlist1">
+--strategy=<strategy>
+</dt>
+<dd>
+<p>
+ Use the given merge strategy. Should only be used once.
+ See the MERGE STRATEGIES section in <a href="git-merge.html">git-merge(1)</a>
+ for details.
+</p>
+</dd>
+<dt class="hdlist1">
+-X<option>
+</dt>
+<dt class="hdlist1">
+--strategy-option=<option>
+</dt>
+<dd>
+<p>
+ Pass the merge strategy-specific option through to the
+ merge strategy. See <a href="git-merge.html">git-merge(1)</a> for details.
+</p>
+</dd>
</dl></div>
</div>
<h2 id="_examples">EXAMPLES</h2>
@@ -567,7 +589,7 @@ git revert -n master~5..master~2 </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-12-03 00:43:00 UTC
+Last updated 2011-02-10 02:03:21 UTC
</div>
</div>
</body>
|