summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-02 11:04:53 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-02 11:04:53 +0900
commitb49ef560ed66449d24a3fdfe25972c390bb44951 (patch)
tree60534d673f60750d6cc4ef2a709ef7a847fc7cdf /.gitignore
parentMerge branch 'pk/rebase-in-c' (diff)
parentrebase -i: move rebase--helper modes to rebase--interactive (diff)
downloadtgif-b49ef560ed66449d24a3fdfe25972c390bb44951.tar.xz
Merge branch 'ag/rebase-i-in-c'
Rewrite of the remaining "rebase -i" machinery in C. * ag/rebase-i-in-c: rebase -i: move rebase--helper modes to rebase--interactive rebase -i: remove git-rebase--interactive.sh rebase--interactive2: rewrite the submodes of interactive rebase in C rebase -i: implement the main part of interactive rebase as a builtin rebase -i: rewrite init_basic_state() in C rebase -i: rewrite write_basic_state() in C rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in C rebase -i: implement the logic to initialize $revisions in C rebase -i: remove unused modes and functions rebase -i: rewrite complete_action() in C t3404: todo list with commented-out commands only aborts sequencer: change the way skip_unnecessary_picks() returns its result sequencer: refactor append_todo_help() to write its message to a buffer rebase -i: rewrite checkout_onto() in C rebase -i: rewrite setup_reflog_action() in C sequencer: add a new function to silence a command, except if it fails rebase -i: rewrite the edit-todo functionality in C editor: add a function to launch the sequence editor rebase -i: rewrite append_todo_help() in C sequencer: make three functions and an enum from sequencer.c public
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 4d5de166e8..0d77ea5894 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,7 +123,6 @@
/git-rebase
/git-rebase--am
/git-rebase--common
-/git-rebase--helper
/git-rebase--interactive
/git-rebase--merge
/git-rebase--preserve-merges