git/Documentation
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
2019-05-09 00:37:27 +09:00
2020-04-22 13:42:55 -07:00
2018-06-25 13:22:36 -07:00
2020-03-22 16:38:30 -07:00
2020-04-10 09:28:02 -07:00
2020-02-14 08:58:53 -08:00
2020-04-29 16:15:27 -07:00
2019-08-11 17:40:07 -07:00
2019-04-02 13:57:00 +09:00
2019-08-11 17:40:07 -07:00
2019-01-23 11:37:29 -08:00
2019-03-18 14:45:21 +09:00
2018-12-26 14:59:37 -08:00
2019-05-07 13:04:48 +09:00
2020-03-30 10:39:48 -07:00
2019-05-07 13:04:48 +09:00
2019-05-07 13:04:48 +09:00
2019-04-02 13:57:00 +09:00
2019-10-21 12:02:39 +09:00