summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)Author
2019-09-18Merge branch 'js/rebase-r-strategy'Junio C Hamano
2019-07-31rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`Johannes Schindelin
2019-07-31rebase -r: support merge strategies other than `recursive`Johannes Schindelin
2019-07-31sequencer: the `am` and `rebase--interactive` scripts are goneJohannes Schindelin
2019-07-19Merge branch 'nd/tree-walk-with-repo'Junio C Hamano
2019-07-19Merge branch 'ra/cherry-pick-revert-skip'Junio C Hamano
2019-07-19Merge branch 'pw/status-with-corrupt-sequencer-state'Junio C Hamano
2019-07-09Merge branch 'sg/rebase-progress'Junio C Hamano
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano
2019-07-09Merge branch 'pw/rebase-abort-clean-rewritten'Junio C Hamano
2019-07-02cherry-pick/revert: advise using --skipRohit Ashiwal
2019-07-02cherry-pick/revert: add --skip optionRohit Ashiwal
2019-07-02sequencer: use argv_array in reset_mergeRohit Ashiwal
2019-07-02sequencer: rename reset_for_rollback to reset_mergeRohit Ashiwal
2019-07-02sequencer: add advice for revertRohit Ashiwal
2019-06-27rebase: fix garbled progress display with '-x'SZEDER Gábor
2019-06-27Use the right 'struct repository' instead of the_repositoryNguyễn Thái Ngọc Duy
2019-06-27tree-walk.c: remove the_repo from fill_tree_descriptor()Nguyễn Thái Ngọc Duy
2019-06-27status: do not report errors in sequencer/todoPhillip Wood
2019-06-27sequencer: factor out todo command name parsingPhillip Wood
2019-06-27sequencer: always allow tab after command namePhillip Wood
2019-06-13Merge branch 'pw/rebase-edit-message-for-replayed-merge'Junio C Hamano
2019-05-19rebase -r: always reword merge -cPhillip Wood
2019-05-15sequencer: return errors from sequencer_remove_state()Phillip Wood
2019-05-15sequencer: the `am` and `rebase--interactive` scripts are goneJohannes Schindelin
2019-05-13Merge branch 'pw/clean-sequencer-state-upon-final-commit'Junio C Hamano
2019-05-13Merge branch 'pw/rebase-i-internal'Junio C Hamano
2019-05-08Merge branch 'dl/merge-cleanup-scissors-fix'Junio C Hamano
2019-05-08Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix'Junio C Hamano
2019-04-25Merge branch 'pw/cherry-pick-continue'Junio C Hamano
2019-04-25Merge branch 'ag/sequencer-reduce-rewriting-todo'Junio C Hamano
2019-04-19rebase -i: use struct commit when parsing optionsPhillip Wood
2019-04-19sequencer: always discard index after checkoutPhillip Wood
2019-04-19Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internalJunio C Hamano
2019-04-19cherry-pick/revert: add scissors line on merge conflictDenton Liu
2019-04-19sequencer.c: save and restore cleanup modePhillip Wood
2019-04-18commit: extract cleanup_mode functions to sequencerDenton Liu
2019-04-18sequencer: fix cleanup with --signoff and -xPhillip Wood
2019-04-17fix cherry-pick/revert status after commitPhillip Wood
2019-04-17commit/reset: try to clean up sequencer statePhillip Wood
2019-03-18cherry-pick --continue: remember optionsPhillip Wood
2019-03-18sequencer: break some long linesPhillip Wood
2019-03-14sequencer: move stale comment into correct locationJohannes Schindelin
2019-03-14sequencer: improve error message when an OID could not be parsedJohannes Schindelin
2019-03-07Merge branch 'jh/trace2'Junio C Hamano
2019-03-07Merge branch 'wh/author-committer-ident-config'Junio C Hamano
2019-03-07rebase--interactive: move transform_todo_file()Alban Gruin
2019-03-07sequencer: use edit_todo_list() in complete_action()Alban Gruin
2019-03-07rebase-interactive: rewrite edit_todo_list() to handle the initial editAlban Gruin
2019-03-07rebase-interactive: append_todo_help() changesAlban Gruin