Merge branch 'pk/rebase-in-c'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 02:04:52 +0000 (11:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 02:04:52 +0000 (11:04 +0900)
commit5ae50845d8a30d7db32e139ce04b712f9deb99cd
tree0b01b1bf5c765b894c5ab6482f143b318f5729bb
parent4ede3d42dfb57f9a41ac96a1f216c62eb7566cc2
parentac7f467fef8b836084afdce5eded047c79a6858d
Merge branch 'pk/rebase-in-c'

Rewrite of the "rebase" machinery in C.

* pk/rebase-in-c:
  builtin/rebase: support running "git rebase <upstream>"
  rebase: refactor common shell functions into their own file
  rebase: start implementing it as a builtin
.gitignore
Makefile
builtin.h
git-legacy-rebase.sh
git.c