diff options
Diffstat (limited to 'third_party/git/Documentation/config/merge.txt')
| -rw-r--r-- | third_party/git/Documentation/config/merge.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/third_party/git/Documentation/config/merge.txt b/third_party/git/Documentation/config/merge.txt index 6a313937f8c0..cb2ed589075b 100644 --- a/third_party/git/Documentation/config/merge.txt +++ b/third_party/git/Documentation/config/merge.txt @@ -70,6 +70,16 @@ merge.stat:: Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default. +merge.autoStash:: + When set to true, automatically create a temporary stash entry + before the operation begins, and apply it after the operation + ends. This means that you can run merge on a dirty worktree. + However, use with care: the final stash application after a + successful merge might result in non-trivial conflicts. + This option can be overridden by the `--no-autostash` and + `--autostash` options of linkgit:git-merge[1]. + Defaults to false. + merge.tool:: Controls which merge tool is used by linkgit:git-mergetool[1]. The list below shows the valid built-in values. |