summaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorLines
2019-07-19Merge branch 'nd/tree-walk-with-repo'Junio C Hamano-3/+3
2019-07-19Merge branch 'ra/cherry-pick-revert-skip'Junio C Hamano-15/+119
2019-07-19Merge branch 'pw/status-with-corrupt-sequencer-state'Junio C Hamano-22/+21
2019-07-09Merge branch 'sg/rebase-progress'Junio C Hamano-3/+14
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano-3/+5
2019-07-09Merge branch 'pw/rebase-abort-clean-rewritten'Junio C Hamano-4/+7
2019-07-02cherry-pick/revert: advise using --skipRohit Ashiwal-3/+6
2019-07-02cherry-pick/revert: add --skip optionRohit Ashiwal-0/+73
2019-07-02sequencer: use argv_array in reset_mergeRohit Ashiwal-6/+11
2019-07-02sequencer: rename reset_for_rollback to reset_mergeRohit Ashiwal-3/+3
2019-07-02sequencer: add advice for revertRohit Ashiwal-6/+29
2019-06-27rebase: fix garbled progress display with '-x'SZEDER Gábor-3/+14
2019-06-27Use the right 'struct repository' instead of the_repositoryNguyễn Thái Ngọc Duy-2/+2
2019-06-27tree-walk.c: remove the_repo from fill_tree_descriptor()Nguyễn Thái Ngọc Duy-1/+1
2019-06-27status: do not report errors in sequencer/todoPhillip Wood-16/+8
2019-06-27sequencer: factor out todo command name parsingPhillip Wood-6/+13
2019-06-27sequencer: always allow tab after command namePhillip Wood-1/+1
2019-06-13Merge branch 'pw/rebase-edit-message-for-replayed-merge'Junio C Hamano-0/+5
2019-05-19rebase -r: always reword merge -cPhillip Wood-0/+5
2019-05-15sequencer: return errors from sequencer_remove_state()Phillip Wood-4/+7
2019-05-15sequencer: the `am` and `rebase--interactive` scripts are goneJohannes Schindelin-1/+1
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