summaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorLines
2019-07-29Merge branch 'pw/rebase-abort-clean-rewritten' into maintJunio C Hamano-4/+7
2019-06-27rebase: fix garbled progress display with '-x'SZEDER Gábor-3/+14
2019-05-15sequencer: return errors from sequencer_remove_state()Phillip Wood-4/+7
2019-05-13Merge branch 'pw/clean-sequencer-state-upon-final-commit'Junio C Hamano-0/+86
2019-05-13Merge branch 'pw/rebase-i-internal'Junio C Hamano-17/+25
2019-05-09Merge branch 'dl/merge-cleanup-scissors-fix'Junio C Hamano-6/+67
2019-05-09Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix'Junio C Hamano-7/+17
2019-04-25Merge branch 'pw/cherry-pick-continue'Junio C Hamano-13/+40
2019-04-25Merge branch 'ag/sequencer-reduce-rewriting-todo'Junio C Hamano-418/+237
2019-04-19rebase -i: use struct commit when parsing optionsPhillip Wood-10/+11
2019-04-19sequencer: always discard index after checkoutPhillip Wood-10/+17
2019-04-19Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internalJunio C Hamano-418/+237
2019-04-19cherry-pick/revert: add scissors line on merge conflictDenton Liu-5/+11
2019-04-19sequencer.c: save and restore cleanup modePhillip Wood-1/+27
2019-04-18commit: extract cleanup_mode functions to sequencerDenton Liu-0/+29
2019-04-18sequencer: fix cleanup with --signoff and -xPhillip Wood-7/+17
2019-04-17fix cherry-pick/revert status after commitPhillip Wood-0/+35
2019-04-17commit/reset: try to clean up sequencer statePhillip Wood-0/+51
2019-03-18cherry-pick --continue: remember optionsPhillip Wood-0/+18
2019-03-18sequencer: break some long linesPhillip Wood-13/+22
2019-03-14sequencer: move stale comment into correct locationJohannes Schindelin-1/+1
2019-03-14sequencer: improve error message when an OID could not be parsedJohannes Schindelin-1/+2
2019-03-07Merge branch 'jh/trace2'Junio C Hamano-0/+2
2019-03-07Merge branch 'wh/author-committer-ident-config'Junio C Hamano-3/+2
2019-03-07rebase--interactive: move transform_todo_file()Alban Gruin-23/+0
2019-03-07sequencer: use edit_todo_list() in complete_action()Alban Gruin-14/+7
2019-03-07rebase-interactive: rewrite edit_todo_list() to handle the initial editAlban Gruin-2/+1
2019-03-07rebase-interactive: append_todo_help() changesAlban Gruin-13/+4
2019-03-07rebase-interactive: use todo_list_write_to_file() in edit_todo_list()Alban Gruin-2/+2
2019-03-07sequencer: refactor skip_unnecessary_picks() to work on a todo_listAlban Gruin-63/+19
2019-03-07rebase--interactive: move rearrange_squash_in_todo_file()Alban Gruin-27/+1
2019-03-07rebase--interactive: move sequencer_add_exec_commands()Alban Gruin-26/+2
2019-03-07sequencer: change complete_action() to use the refactored functionsAlban Gruin-45/+34
2019-03-07sequencer: make sequencer_make_script() write its script to a strbufAlban Gruin-23/+18
2019-03-07sequencer: refactor rearrange_squash() to work on a todo_listAlban Gruin-45/+47
2019-03-07sequencer: refactor sequencer_add_exec_commands() to work on a todo_listAlban Gruin-40/+74
2019-02-22trace2:data: add trace2 hook classificationJeff Hostetler-0/+2
2019-02-13Merge branch 'rj/sequencer-sign-off-header-static'Junio C Hamano-1/+1
2019-02-11sequencer: make sign_off_header a file local symbolRamsay Jones-1/+1
2019-02-06Merge branch 'nd/the-index-final'Junio C Hamano-20/+21
2019-02-06Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano-10/+13
2019-02-04config: allow giving separate author and committer identsWilliam Hubbs-3/+2
2019-01-29Merge branch 'js/rebase-i-redo-exec'Junio C Hamano-3/+10
2019-01-29sequencer: refactor check_todo_list() to work on a todo_listAlban Gruin-98/+23
2019-01-29sequencer: introduce todo_list_write_to_file()Alban Gruin-20/+41
2019-01-29sequencer: refactor transform_todos() to work on a todo_listAlban Gruin-18/+36
2019-01-29sequencer: remove the 'arg' field from todo_itemAlban Gruin-29/+38
2019-01-18Merge branch 'so/cherry-pick-always-allow-m1'Junio C Hamano-3/+7
2019-01-18Merge branch 'nd/style-opening-brace'Junio C Hamano-2/+4
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy-2/+2