summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2017-05-23Merge branch 'bc/object-id'Libravatar Junio C Hamano1-29/+30
2017-05-16Merge branch 'jt/use-trailer-api-in-commands'Libravatar Junio C Hamano1-7/+4
2017-05-08tree: convert parse_tree_indirect to struct object_idLibravatar brian m. carlson1-1/+1
2017-05-08sequencer: convert do_recursive_merge to struct object_idLibravatar brian m. carlson1-3/+3
2017-05-08merge: convert checkout_fast_forward to struct object_idLibravatar brian m. carlson1-1/+1
2017-05-08sequencer: convert fast_forward_to to struct object_idLibravatar brian m. carlson1-11/+11
2017-05-08Convert lookup_tree to struct object_idLibravatar brian m. carlson1-1/+1
2017-05-08Convert lookup_commit* to struct object_idLibravatar brian m. carlson1-4/+4
2017-05-08Convert remaining callers of lookup_commit_reference* to object_idLibravatar brian m. carlson1-10/+10
2017-05-08sequencer: convert some functions to struct object_idLibravatar brian m. carlson1-6/+6
2017-05-02Convert struct cache_tree to use struct object_idLibravatar brian m. carlson1-1/+2
2017-05-01Merge branch 'sh/rebase-i-reread-todo-after-exec'Libravatar Junio C Hamano1-0/+22
2017-04-27rebase -i: reread the todo list if `exec` touched itLibravatar Stephen Hicks1-0/+22
2017-04-26sequencer: add newline before adding footersLibravatar Jonathan Tan1-7/+4
2017-04-26Merge branch 'jk/war-on-git-path'Libravatar Junio C Hamano1-6/+6
2017-04-20use git_path_* helper functionsLibravatar Jeff King1-6/+6
2017-03-30Merge branch 'js/rebase-i-reword-to-run-hooks'Libravatar Junio C Hamano1-23/+31
2017-03-27sequencer: allow the commit-msg hooks to run during a `reword`Libravatar Johannes Schindelin1-2/+6
2017-03-27sequencer: make commit options more extensibleLibravatar Johannes Schindelin1-22/+26
2017-03-23sequencer: fix missing newlineLibravatar Brandon Williams1-1/+1
2017-03-17sequencer: drop "warning:" when stopping for editLibravatar Jeff King1-1/+2
2017-01-17sequencer (rebase -i): write out the final messageLibravatar Johannes Schindelin1-0/+3
2017-01-17sequencer (rebase -i): write the progress into filesLibravatar Johannes Schindelin1-3/+27
2017-01-17sequencer (rebase -i): show the progressLibravatar Johannes Schindelin1-0/+32
2017-01-17sequencer (rebase -i): suggest --edit-todo upon unknown commandLibravatar Johannes Schindelin1-1/+5
2017-01-17sequencer (rebase -i): show only failed cherry-picks' outputLibravatar Johannes Schindelin1-0/+4
2017-01-17sequencer (rebase -i): show only failed `git commit`'s outputLibravatar Johannes Schindelin1-0/+18
2017-01-17sequencer: use run_command() directlyLibravatar Johannes Schindelin1-20/+16
2017-01-17sequencer: update reading author-scriptLibravatar Johannes Schindelin1-22/+12
2017-01-09sequencer (rebase -i): differentiate between comments and 'noop'Libravatar Johannes Schindelin1-6/+9
2017-01-09sequencer (rebase -i): implement the 'drop' commandLibravatar Johannes Schindelin1-3/+5
2017-01-09sequencer (rebase -i): allow rescheduling commandsLibravatar Johannes Schindelin1-0/+6
2017-01-09sequencer (rebase -i): respect strategy/strategy_opts settingsLibravatar Johannes Schindelin1-1/+25
2017-01-09sequencer (rebase -i): respect the rebase.autostash settingLibravatar Johannes Schindelin1-0/+43
2017-01-09sequencer (rebase -i): run the post-rewrite hook, if neededLibravatar Johannes Schindelin1-0/+14
2017-01-09sequencer (rebase -i): record interrupted commits in rewritten, tooLibravatar Johannes Schindelin1-0/+8
2017-01-09sequencer (rebase -i): copy commit notes at endLibravatar Johannes Schindelin1-0/+76
2017-01-09sequencer (rebase -i): set the reflog message consistentlyLibravatar Johannes Schindelin1-0/+4
2017-01-09sequencer (rebase -i): refactor setting the reflog messageLibravatar Johannes Schindelin1-7/+26
2017-01-09sequencer (rebase -i): allow fast-forwarding for edit/rewordLibravatar Johannes Schindelin1-8/+17
2017-01-09sequencer (rebase -i): implement the 'reword' commandLibravatar Johannes Schindelin1-2/+7
2017-01-09sequencer (rebase -i): leave a patch upon errorLibravatar Johannes Schindelin1-1/+3
2017-01-09sequencer (rebase -i): update refs after a successful rebaseLibravatar Johannes Schindelin1-1/+45
2017-01-09sequencer (rebase -i): the todo can be empty when continuingLibravatar Johannes Schindelin1-2/+5
2017-01-09sequencer (rebase -i): skip some revert/cherry-pick specific code pathLibravatar Johannes Schindelin1-12/+14
2017-01-09sequencer (rebase -i): remove CHERRY_PICK_HEAD when no longer neededLibravatar Johannes Schindelin1-1/+6
2017-01-09sequencer (rebase -i): allow continuing with staged changesLibravatar Johannes Schindelin1-0/+40
2017-01-09sequencer (rebase -i): write an author-script fileLibravatar Johannes Schindelin1-1/+49
2017-01-09sequencer (rebase -i): implement the short commandsLibravatar Johannes Schindelin1-14/+21
2017-01-09sequencer (rebase -i): add support for the 'fixup' and 'squash' commandsLibravatar Johannes Schindelin1-10/+217