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
..
2020-04-29 16:15:27 -07:00
2020-03-09 07:57:57 -07:00
2020-04-28 15:50:33 -07:00
2020-03-23 13:14:53 -07:00
2020-03-29 09:25:38 -07:00
2019-10-06 12:25:16 +09:00
2020-04-22 13:42:48 -07:00
2020-04-22 13:42:55 -07:00
2019-12-13 12:18:07 -08:00
2019-09-17 12:14:06 -07:00
2020-02-09 09:25:24 -08:00
2020-02-18 13:53:30 -08:00
2020-04-28 15:50:01 -07:00
2019-12-04 10:10:37 -08:00
2020-04-03 11:37:22 -07:00
2019-12-06 15:09:24 -08:00
2019-10-29 11:53:56 +09:00
2019-12-10 13:11:41 -08:00
2019-11-07 13:42:00 +09:00
2020-03-17 15:02:23 -07:00
2020-04-06 13:42:43 -07:00
2020-04-03 11:37:22 -07:00
2019-10-11 14:24:46 +09:00
2020-03-22 16:38:30 -07:00
2020-02-04 11:36:37 -08:00
2020-04-03 11:37:22 -07:00
2020-04-03 11:37:22 -07:00
2020-02-10 10:49:12 -08:00
2019-11-18 15:21:29 +09:00
2019-11-07 13:42:00 +09:00
2019-11-02 13:16:41 +09:00
2019-11-07 13:42:00 +09:00
2020-02-28 09:53:41 -08:00
2019-08-05 10:05:24 -07:00
2020-02-04 12:17:18 -08:00
2020-04-07 22:37:18 -07:00
2019-09-05 13:01:48 -07:00
2020-04-28 15:50:09 -07:00
2019-10-06 09:45:02 +09:00
2020-02-24 09:33:27 -08:00
2020-04-28 15:50:08 -07:00
2020-04-06 13:42:43 -07:00
2020-03-17 15:02:24 -07:00
2019-09-09 11:05:51 -07:00
2019-09-09 11:05:52 -07:00
2020-04-10 09:28:02 -07:00
2019-10-23 12:05:06 +09:00
2019-10-18 09:43:10 +09:00
2020-02-14 08:58:53 -08:00
2020-03-20 14:22:31 -07:00
2020-04-29 16:15:27 -07:00
2019-08-11 17:40:07 -07:00
2019-12-05 12:52:44 -08:00
2020-04-06 13:42:43 -07:00
2020-04-28 15:49:56 -07:00
2019-09-09 11:05:52 -07:00
2019-08-11 17:40:07 -07:00
2019-09-05 13:01:48 -07:00
2020-04-06 13:42:43 -07:00
2020-04-06 13:42:43 -07:00
2019-10-06 09:45:19 +09:00
2019-11-20 10:19:58 +09:00
2020-04-03 11:37:22 -07:00
2020-02-19 10:56:49 -08:00
2019-09-09 11:05:51 -07:00
2019-11-10 15:13:23 +09:00
2020-03-05 10:43:02 -08:00
2020-02-19 10:56:49 -08:00
2019-09-09 11:05:51 -07:00
2020-03-05 10:43:03 -08:00
2019-11-23 09:49:23 +09:00
2020-04-06 13:42:43 -07:00
2019-11-07 13:42:00 +09:00
2020-01-22 12:27:49 -08:00
2020-02-24 09:33:29 -08:00
2019-12-01 09:04:36 -08:00
2020-03-17 15:02:24 -07:00
2020-01-08 08:56:40 -08:00
2020-03-05 10:43:02 -08:00
2020-03-30 10:39:48 -07:00
2020-04-22 13:42:43 -07:00
2019-12-26 11:00:15 -08:00
2019-12-25 11:21:59 -08:00
2019-10-23 14:43:11 +09:00
2019-11-10 18:02:14 +09:00
2020-04-06 13:42:43 -07:00
2019-09-09 11:05:52 -07:00
2019-08-05 10:05:24 -07:00
2020-04-28 15:50:00 -07:00
2020-03-29 09:25:38 -07:00
2020-03-29 09:25:38 -07:00
2019-09-16 12:20:39 -07:00
2020-04-29 16:15:27 -07:00
2019-11-11 11:04:46 +09:00
2020-02-14 09:36:56 -08:00
2020-03-30 11:16:41 -07:00
2020-04-15 22:08:53 -07:00
2019-12-10 13:11:43 -08:00
2020-04-05 15:00:03 -07:00
2020-04-10 09:58:55 -07:00
2020-04-21 13:21:52 -07:00
2019-12-10 13:11:43 -08:00
2019-10-04 09:26:42 +09:00
2019-10-21 12:02:39 +09:00
2020-03-31 16:08:02 -07:00
2019-12-06 15:09:24 -08:00