diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-09 02:18:07 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-09 02:18:07 +0900 |
| commit | d1063b1b2e658ecbb78ae560ecb80d543e8c78c5 (patch) | |
| tree | 0866004a8e9aed3f3a78c77d85729a8845fbb81c /git-cherry-pick.html | |
| parent | 2ba14716c3b8d8081480683846aefbc1d2abe0db (diff) | |
| download | git-htmldocs-d1063b1b2e658ecbb78ae560ecb80d543e8c78c5.tar.gz | |
Autogenerated HTML docs for v2.21.0-896-g6a6c0f
Diffstat (limited to 'git-cherry-pick.html')
| -rw-r--r-- | git-cherry-pick.html | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/git-cherry-pick.html b/git-cherry-pick.html index f85929b38..578a9e842 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -836,6 +836,18 @@ conflicts.</p></div> </p>
</dd>
<dt class="hdlist1">
+--cleanup=<mode>
+</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><mode></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">
-x
</dt>
<dd>
@@ -1188,7 +1200,7 @@ try to apply the change introduced by <code>topic^</code> again, <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>
|