diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-29 23:15:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-29 23:15:27 (GMT) |
| commit | bf10200871d9e7e1fc9f54aca9b2fe40bc4e4ac7 (patch) | |
| tree | 41c8af11bdbfb05d0c13db0e66c3bbddb6702e93 /Documentation/merge-options.txt | |
| parent | 86ab15cb154862b6fa5cc646dac27532f881e1fb (diff) | |
| parent | d9f15d37f1a545305988f6b2bb40de1fbf0049cf (diff) | |
| download | git-bf10200871d9e7e1fc9f54aca9b2fe40bc4e4ac7.zip git-bf10200871d9e7e1fc9f54aca9b2fe40bc4e4ac7.tar.gz git-bf10200871d9e7e1fc9f54aca9b2fe40bc4e4ac7.tar.bz2 | |
Merge branch 'dl/merge-autostash'
"git merge" learns the "--autostash" option.
* dl/merge-autostash: (22 commits)
pull: pass --autostash to merge
t5520: make test_pull_autostash() accept expect_parent_num
merge: teach --autostash option
sequencer: implement apply_autostash_oid()
sequencer: implement save_autostash()
sequencer: unlink autostash in apply_autostash()
sequencer: extract perform_autostash() from rebase
rebase: generify create_autostash()
rebase: extract create_autostash()
reset: extract reset_head() from rebase
rebase: generify reset_head()
rebase: use apply_autostash() from sequencer.c
sequencer: rename stash_sha1 to stash_oid
sequencer: make apply_autostash() accept a path
rebase: use read_oneliner()
sequencer: make read_oneliner() extern
sequencer: configurably warn on non-existent files
sequencer: make read_oneliner() accept flags
sequencer: make file exists check more efficient
sequencer: stop leaking buf
...
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index fb3a6e8..80d4831 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/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 |