diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-29 17:03:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-29 17:03:20 -0700 |
| commit | 67cc2b7cdda7af3a7079b399a8a154d094efc649 (patch) | |
| tree | 9c4830195de2ffd5ecdfca15e0e04be9bf959a4e /merge-options.txt | |
| parent | 0dd50943c112dfc70367bd39eb3c88371db2518f (diff) | |
| download | git-htmldocs-67cc2b7cdda7af3a7079b399a8a154d094efc649.tar.gz | |
Autogenerated HTML docs for v2.26.2-447-gd61d2
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/merge-options.txt b/merge-options.txt index fb3a6e8d4..80d483166 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -160,6 +160,14 @@ ifndef::git-pull[] endif::git-pull[] +--autostash:: +--no-autostash:: + Automatically create a temporary stash entry before the operation + begins, and apply it after the operation ends. This means + that you can run the operation on a dirty worktree. However, use + with care: the final stash application after a successful + merge might result in non-trivial conflicts. + --allow-unrelated-histories:: By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be |