diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:22 (GMT) |
| commit | e52c6bbd131f1f4f17b95e28d12ead0c81a8e890 (patch) | |
| tree | 2b13d55ade4b7427e00ae1ad2d5b4175556be415 /builtin/pull.c | |
| parent | 09a9c1f427c110f1281eea55c48596c8c8701a13 (diff) | |
| parent | 21853626eac565dd42572d90724b29863f61eb3b (diff) | |
| download | git-e52c6bbd131f1f4f17b95e28d12ead0c81a8e890.zip git-e52c6bbd131f1f4f17b95e28d12ead0c81a8e890.tar.gz git-e52c6bbd131f1f4f17b95e28d12ead0c81a8e890.tar.bz2 | |
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
Diffstat (limited to 'builtin/pull.c')
0 files changed, 0 insertions, 0 deletions