summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLibravatar Alban Gruin <alban.gruin@gmail.com>2018-09-27 23:56:07 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-09 10:44:10 +0900
commit53bbcfbde7c29611f16722c3fbcdb2b78718f633 (patch)
tree4a2761ec2411f5e88e3c024f928566499171e7b2 /.gitignore
parentrebase -i: rewrite init_basic_state() in C (diff)
downloadtgif-53bbcfbde7c29611f16722c3fbcdb2b78718f633.tar.xz
rebase -i: implement the main part of interactive rebase as a builtin
This rewrites the part of interactive rebase which initializes the basic state, make the script and complete the action, as a buitin, named git-rebase--interactive2 for now. Others modes (`--continue`, `--edit-todo`, etc.) will be rewritten in the next commit. git-rebase--interactive.sh is modified to call git-rebase--interactive2 instead of git-rebase--helper. Signed-off-by: Alban Gruin <alban.gruin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3284a1e9b1..404c9a8472 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,6 +118,7 @@
/git-rebase--am
/git-rebase--helper
/git-rebase--interactive
+/git-rebase--interactive2
/git-rebase--merge
/git-rebase--preserve-merges
/git-receive-pack