]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 09a9c1f 2185362)
Merge branch 'js/rebase-am'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:22 +0000 (22:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:22 +0000 (22:05 -0800)
commite52c6bbd131f1f4f17b95e28d12ead0c81a8e890
tree2b13d55ade4b7427e00ae1ad2d5b4175556be415tree | snapshot
parent09a9c1f427c110f1281eea55c48596c8c8701a13commit | diff
parent21853626eac565dd42572d90724b29863f61eb3bcommit | diff
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
builtin/rebase.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.