summaryrefslogtreecommitdiff
path: root/sequencer.h
AgeCommit message (Expand)Author
13 daysMerge branch 'pw/advise-rebase-skip'Junio C Hamano
2020-03-02Merge branch 'en/rebase-backend'Junio C Hamano
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyElijah Newren
2020-02-16rebase (interactive-backend): make --keep-empty the defaultElijah Newren
2020-02-14Merge branch 'ag/edit-todo-drop-check'Junio C Hamano
2020-02-14Merge branch 'ag/rebase-avoid-unneeded-checkout'Junio C Hamano
2020-01-28rebase-interactive: warn if commit is dropped with `rebase --edit-todo'Alban Gruin
2020-01-28sequencer: move check_todo_list_from_file() to rebase-interactive.cAlban Gruin
2020-01-24rebase -i: stop checking out the tip of the branch to rebaseAlban Gruin
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano
2019-12-10Merge branch 'ra/rebase-i-more-options'Junio C Hamano
2019-12-06commit: encapsulate determine_whence() for sequencerPhillip Wood
2019-11-10Merge branch 'pw/post-commit-from-sequencer'Junio C Hamano
2019-11-02rebase -i: support --ignore-dateRohit Ashiwal
2019-11-02rebase -i: support --committer-date-is-author-dateRohit Ashiwal
2019-10-16sequencer.h fix placement of #endifPhillip Wood
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-19Merge branch 'ra/cherry-pick-revert-skip'Junio C Hamano
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano
2019-07-02cherry-pick/revert: add --skip optionRohit Ashiwal
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 '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-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-07rebase--interactive: move transform_todo_file()Alban Gruin
2019-03-07rebase-interactive: rewrite edit_todo_list() to handle the initial editAlban Gruin
2019-03-07rebase-interactive: use todo_list_write_to_file() in edit_todo_list()Alban Gruin
2019-03-07rebase--interactive: move rearrange_squash_in_todo_file()Alban Gruin
2019-03-07rebase--interactive: move sequencer_add_exec_commands()Alban Gruin
2019-03-07sequencer: change complete_action() to use the refactored functionsAlban Gruin
2019-03-07sequencer: make sequencer_make_script() write its script to a strbufAlban Gruin
2019-03-07sequencer: refactor rearrange_squash() to work on a todo_listAlban Gruin
2019-03-07sequencer: refactor sequencer_add_exec_commands() to work on a todo_listAlban Gruin
2019-02-14Merge branch 'rj/sequencer-sign-off-header-static'Junio C Hamano
2019-02-11sequencer: make sign_off_header a file local symbolRamsay Jones
2019-02-07Merge branch 'nd/the-index-final'Junio C Hamano
2019-02-07Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano
2019-01-29Merge branch 'js/rebase-i-redo-exec'Junio C Hamano
2019-01-29sequencer: refactor check_todo_list() to work on a todo_listAlban Gruin
2019-01-29sequencer: introduce todo_list_write_to_file()Alban Gruin