Hi Junio On 01/04/2020 00:04, Junio C Hamano wrote:
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. [...] * dl/merge-autostash (2020-03-24) 19 commits - pull: pass --autostash to merge - t5520: make test_pull_autostash() accept expect_parent_num - merge: teach --autostash option - 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: make apply_rebase() 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: use file strbuf for read_oneliner() - t7600: use test_write_lines() - Makefile: ASCII-sort += lists "git merge" learns the "--autostash" option. Will merge to 'next'.
I've posted some comments on this today, I'm not sure about the behavior of 'git reset' after 'git merge --autostash'
Best Wishes Phillip
