summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)Author
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: 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
2019-03-07rebase-interactive: use todo_list_write_to_file() in edit_todo_list()Alban Gruin
2019-03-07sequencer: refactor skip_unnecessary_picks() to work on a todo_listAlban 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-22trace2:data: add trace2 hook classificationJeff Hostetler
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-02-04config: allow giving separate author and committer identsWilliam Hubbs
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
2019-01-29sequencer: refactor transform_todos() to work on a todo_listAlban Gruin
2019-01-29sequencer: remove the 'arg' field from todo_itemAlban Gruin
2019-01-18Merge branch 'so/cherry-pick-always-allow-m1'Junio C Hamano
2019-01-18Merge branch 'nd/style-opening-brace'Junio C Hamano
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy