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

diff --cc .gitignore
Simple merge

diff --cc Makefile
index b08d5ea258c69a78745dfa73fe698c11d021858a,c210681a1dbc4320e59f5b4b1e57aedabaa3f35d..95b93c709d65f1a3b8a96e5911c33c1322220e8c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1091,8 -1063,8 +1092,9 @@@ BUILTIN_OBJS += builtin/prune-packed.
  BUILTIN_OBJS += builtin/prune.o
  BUILTIN_OBJS += builtin/pull.o
  BUILTIN_OBJS += builtin/push.o
 +BUILTIN_OBJS += builtin/range-diff.o
  BUILTIN_OBJS += builtin/read-tree.o
+ BUILTIN_OBJS += builtin/rebase.o
  BUILTIN_OBJS += builtin/rebase--helper.o
  BUILTIN_OBJS += builtin/receive-pack.o
  BUILTIN_OBJS += builtin/reflog.o

diff --cc builtin.h
index 962f0489ab212cc613d98ac2577f3999278d099b,44651a447f5d52d9d36654d92a27a65f08d284b8..6fb66f5ba40bca73ba62c6d340ab8f4f58ce1e32
--- 1/builtin.h
--- 2/builtin.h
+++ b/builtin.h
@@@ -202,8 -201,8 +202,9 @@@ extern int cmd_prune(int argc, const ch
  extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
  extern int cmd_pull(int argc, const char **argv, const char *prefix);
  extern int cmd_push(int argc, const char **argv, const char *prefix);
 +extern int cmd_range_diff(int argc, const char **argv, const char *prefix);
  extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
+ extern int cmd_rebase(int argc, const char **argv, const char *prefix);
  extern int cmd_rebase__helper(int argc, const char **argv, const char *prefix);
  extern int cmd_receive_pack(int argc, const char **argv, const char *prefix);
  extern int cmd_reflog(int argc, const char **argv, const char *prefix);

diff --cc git-legacy-rebase.sh
Simple merge

diff --cc git.c
index adac132956e995e2dfe050b0f709ff9aaa9c7673,2c6b188c77db82a2f02ce44f0641573cd00f0a61..8e522768315581a7a401e8cc6a09900e9ab9ad68
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -524,8 -520,13 +524,14 @@@ static struct cmd_struct commands[] = 
        { "prune-packed", cmd_prune_packed, RUN_SETUP },
        { "pull", cmd_pull, RUN_SETUP | NEED_WORK_TREE },
        { "push", cmd_push, RUN_SETUP },
 +      { "range-diff", cmd_range_diff, RUN_SETUP | USE_PAGER },
        { "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
+       /*
+        * NEEDSWORK: Until the rebase is independent and needs no redirection
+        * to rebase shell script this is kept as is, then should be changed to
+        * RUN_SETUP | NEED_WORK_TREE
+        */
+       { "rebase", cmd_rebase },
        { "rebase--helper", cmd_rebase__helper, RUN_SETUP | NEED_WORK_TREE },
        { "receive-pack", cmd_receive_pack },
        { "reflog", cmd_reflog, RUN_SETUP },