summaryrefslogtreecommitdiffstats
path: root/git-revert.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-09 02:18:07 +0900
committerJunio C Hamano <gitster@pobox.com>2019-05-09 02:18:07 +0900
commitd1063b1b2e658ecbb78ae560ecb80d543e8c78c5 (patch)
tree0866004a8e9aed3f3a78c77d85729a8845fbb81c /git-revert.html
parent2ba14716c3b8d8081480683846aefbc1d2abe0db (diff)
downloadgit-htmldocs-d1063b1b2e658ecbb78ae560ecb80d543e8c78c5.tar.gz
Autogenerated HTML docs for v2.21.0-896-g6a6c0f
Diffstat (limited to 'git-revert.html')
-rw-r--r--git-revert.html14
1 files changed, 13 insertions, 1 deletions
diff --git a/git-revert.html b/git-revert.html
index 6a4faf5e1..7b0375056 100644
--- a/git-revert.html
+++ b/git-revert.html
@@ -835,6 +835,18 @@ more details.</p></div>
</p>
</dd>
<dt class="hdlist1">
+--cleanup=&lt;mode&gt;
+</dt>
+<dd>
+<p>
+ This option determines how the commit message will be cleaned up before
+ being passed on to the commit machinery. See <a href="git-commit.html">git-commit(1)</a> for more
+ details. In particular, if the <em>&lt;mode&gt;</em> is given a value of <code>scissors</code>,
+ scissors will be appended to <code>MERGE_MSG</code> before being passed on in the case
+ of a conflict.
+</p>
+</dd>
+<dt class="hdlist1">
-n
</dt>
<dt class="hdlist1">
@@ -996,7 +1008,7 @@ effect to your index in a row.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2019-04-16 21:48:13 JST
+ 2019-05-09 02:15:17 JST
</div>
</div>
</body>