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-merge.html | |
| parent | 2ba14716c3b8d8081480683846aefbc1d2abe0db (diff) | |
| download | git-htmldocs-d1063b1b2e658ecbb78ae560ecb80d543e8c78c5.tar.gz | |
Autogenerated HTML docs for v2.21.0-896-g6a6c0f
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/git-merge.html b/git-merge.html index 9fdcac2cf..5b2c6fda6 100644 --- a/git-merge.html +++ b/git-merge.html @@ -850,6 +850,18 @@ updated behaviour, the environment variable <code>GIT_MERGE_AUTOEDIT</code> can set to <code>no</code> at the beginning of them.</p></div>
</dd>
<dt class="hdlist1">
+--cleanup=<mode>
+</dt>
+<dd>
+<p>
+ This option determines how the merge message will be cleaned up before
+ commiting. See <a href="git-commit.html">git-commit(1)</a> for more details. In addition, 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 to the commit machinery in the
+ case of a merge conflict.
+</p>
+</dd>
+<dt class="hdlist1">
--ff
</dt>
<dd>
@@ -1741,9 +1753,27 @@ merge.renames </dt>
<dd>
<p>
- Whether and how Git detects renames. If set to "false",
- rename detection is disabled. If set to "true", basic rename
- detection is enabled. Defaults to the value of diff.renames.
+ Whether Git detects renames. If set to "false", rename detection
+ is disabled. If set to "true", basic rename detection is enabled.
+ Defaults to the value of diff.renames.
+</p>
+</dd>
+<dt class="hdlist1">
+merge.directoryRenames
+</dt>
+<dd>
+<p>
+ Whether Git detects directory renames, affecting what happens at
+ merge time to new files added to a directory on one side of
+ history when that directory was renamed on the other side of
+ history. If merge.directoryRenames is set to "false", directory
+ rename detection is disabled, meaning that such new files will be
+ left behind in the old directory. If set to "true", directory
+ rename detection is enabled, meaning that such new files will be
+ moved into the new directory. If set to "conflict", a conflict
+ will be reported for such paths. If merge.renames is false,
+ merge.directoryRenames is ignored and treated as false. Defaults
+ to "conflict".
</p>
</dd>
<dt class="hdlist1">
|