From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Feb 2017 21:57:14 +0000 (-0800)
Subject: Merge branch 'js/rebase-helper'
X-Git-Tag: v2.13.0-rc0~168
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/098ed50e8a7c581e23cd51b737fb780228fe6f31?ds=inline;hp=-c

Merge branch 'js/rebase-helper'

"git rebase -i" starts using the recently updated "sequencer" code.

* js/rebase-helper:
rebase -i: use the rebase--helper builtin
rebase--helper: add a builtin helper for interactive rebases
---

098ed50e8a7c581e23cd51b737fb780228fe6f31
diff --combined Makefile
index a5433978e3,29f8663509..9ec6065cc2
--- a/Makefile
+++ b/Makefile
@@@ -781,7 -781,6 +781,7 @@@ LIB_OBJS += notes-cache.
  LIB_OBJS += notes-merge.o
  LIB_OBJS += notes-utils.o
  LIB_OBJS += object.o
 +LIB_OBJS += oidset.o
  LIB_OBJS += pack-bitmap.o
  LIB_OBJS += pack-bitmap-write.o
  LIB_OBJS += pack-check.o
@@@ -933,6 -932,7 +933,7 @@@ BUILTIN_OBJS += builtin/prune.
  BUILTIN_OBJS += builtin/pull.o
  BUILTIN_OBJS += builtin/push.o
  BUILTIN_OBJS += builtin/read-tree.o
+ BUILTIN_OBJS += builtin/rebase--helper.o
  BUILTIN_OBJS += builtin/receive-pack.o
  BUILTIN_OBJS += builtin/reflog.o
  BUILTIN_OBJS += builtin/remote.o