Junio C Hamano
bf10200871
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
...
2020-04-29 16:15:27 -07:00
..
2019-11-14 11:10:04 +09:00
2020-02-06 11:08:00 -08:00
2019-06-06 09:33:42 -07:00
2019-05-16 11:36:23 +09:00
2020-02-10 10:52:10 -08:00
2019-04-02 13:57:00 +09:00
2019-08-11 17:40:07 -07:00
2020-01-23 15:10:23 -08:00
2019-09-09 12:26:36 -07:00
2020-03-20 14:22:31 -07:00
2020-04-06 13:42:43 -07:00
2020-04-07 22:37:18 -07:00
2019-03-07 09:25:32 +09:00
2019-08-13 13:33:55 -07:00
2020-01-15 14:06:06 -08:00
2020-03-25 13:57:42 -07:00
2019-08-13 13:33:55 -07:00
2019-05-07 13:04:47 +09:00
2020-04-16 11:05:48 -07:00
2020-04-10 09:28:02 -07:00
2020-03-20 14:22:31 -07:00
2020-04-22 11:37:44 -07:00
2020-02-10 10:52:10 -08:00
2020-04-06 13:42:43 -07:00
2020-02-16 15:40:42 -08:00
2019-06-25 14:05:38 -07:00
2019-03-18 14:09:54 +09:00
2020-03-05 12:50:28 -08:00
2019-06-21 09:35:00 -07:00
2020-04-06 13:42:43 -07:00
2020-03-18 12:42:09 -07:00
2020-03-18 12:42:09 -07:00
2020-03-23 13:14:53 -07:00
2019-08-05 10:05:24 -07:00
2018-10-29 10:17:04 +09:00
2018-10-29 10:17:04 +09:00
2018-10-29 10:17:04 +09:00
2020-01-22 12:27:08 -08:00
2018-10-29 10:17:05 +09:00
2018-10-29 10:17:05 +09:00
2018-12-28 13:27:11 -08:00