tree 2b13d55ade4b7427e00ae1ad2d5b4175556be415
parent 09a9c1f427c110f1281eea55c48596c8c8701a13
parent 21853626eac565dd42572d90724b29863f61eb3b
author Junio C Hamano <gitster@pobox.com> 1549519522 -0800
committer Junio C Hamano <gitster@pobox.com> 1549519522 -0800

Merge branch 'js/rebase-am'

Instead of going through "git-rebase--am" scriptlet to use the "am"
backend, the built-in version of "git rebase" learned to drive the
"am" backend directly.

* js/rebase-am:
  built-in rebase: call `git am` directly
  rebase: teach `reset_head()` to optionally skip the worktree
  rebase: avoid double reflog entry when switching branches
  rebase: move `reset_head()` into a better spot