summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2019-07-31rebase -r: support merge strategies other than `recursive`Libravatar Johannes Schindelin1-2/+12
2019-07-31sequencer: the `am` and `rebase--interactive` scripts are goneLibravatar Johannes Schindelin1-1/+1
2019-05-13Merge branch 'pw/clean-sequencer-state-upon-final-commit'Libravatar Junio C Hamano1-0/+86
2019-05-13Merge branch 'pw/rebase-i-internal'Libravatar Junio C Hamano1-17/+25
2019-05-09Merge branch 'dl/merge-cleanup-scissors-fix'Libravatar Junio C Hamano1-6/+67
2019-05-09Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix'Libravatar Junio C Hamano1-7/+17
2019-04-25Merge branch 'pw/cherry-pick-continue'Libravatar Junio C Hamano1-13/+40
2019-04-25Merge branch 'ag/sequencer-reduce-rewriting-todo'Libravatar Junio C Hamano1-418/+237
2019-04-19rebase -i: use struct commit when parsing optionsLibravatar Phillip Wood1-10/+11
2019-04-19sequencer: always discard index after checkoutLibravatar Phillip Wood1-10/+17
2019-04-19Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internalLibravatar Junio C Hamano1-418/+237
2019-04-19cherry-pick/revert: add scissors line on merge conflictLibravatar Denton Liu1-5/+11
2019-04-19sequencer.c: save and restore cleanup modeLibravatar Phillip Wood1-1/+27
2019-04-18commit: extract cleanup_mode functions to sequencerLibravatar Denton Liu1-0/+29
2019-04-18sequencer: fix cleanup with --signoff and -xLibravatar Phillip Wood1-7/+17
2019-04-17fix cherry-pick/revert status after commitLibravatar Phillip Wood1-0/+35
2019-04-17commit/reset: try to clean up sequencer stateLibravatar Phillip Wood1-0/+51
2019-03-18cherry-pick --continue: remember optionsLibravatar Phillip Wood1-0/+18
2019-03-18sequencer: break some long linesLibravatar Phillip Wood1-13/+22
2019-03-14sequencer: move stale comment into correct locationLibravatar Johannes Schindelin1-1/+1
2019-03-14sequencer: improve error message when an OID could not be parsedLibravatar Johannes Schindelin1-1/+2
2019-03-07Merge branch 'jh/trace2'Libravatar Junio C Hamano1-0/+2
2019-03-07Merge branch 'wh/author-committer-ident-config'Libravatar Junio C Hamano1-3/+2
2019-03-07rebase--interactive: move transform_todo_file()Libravatar Alban Gruin1-23/+0
2019-03-07sequencer: use edit_todo_list() in complete_action()Libravatar Alban Gruin1-14/+7
2019-03-07rebase-interactive: rewrite edit_todo_list() to handle the initial editLibravatar Alban Gruin1-2/+1
2019-03-07rebase-interactive: append_todo_help() changesLibravatar Alban Gruin1-13/+4
2019-03-07rebase-interactive: use todo_list_write_to_file() in edit_todo_list()Libravatar Alban Gruin1-2/+2
2019-03-07sequencer: refactor skip_unnecessary_picks() to work on a todo_listLibravatar Alban Gruin1-63/+19
2019-03-07rebase--interactive: move rearrange_squash_in_todo_file()Libravatar Alban Gruin1-27/+1
2019-03-07rebase--interactive: move sequencer_add_exec_commands()Libravatar Alban Gruin1-26/+2
2019-03-07sequencer: change complete_action() to use the refactored functionsLibravatar Alban Gruin1-45/+34
2019-03-07sequencer: make sequencer_make_script() write its script to a strbufLibravatar Alban Gruin1-23/+18
2019-03-07sequencer: refactor rearrange_squash() to work on a todo_listLibravatar Alban Gruin1-45/+47
2019-03-07sequencer: refactor sequencer_add_exec_commands() to work on a todo_listLibravatar Alban Gruin1-40/+74
2019-02-22trace2:data: add trace2 hook classificationLibravatar Jeff Hostetler1-0/+2
2019-02-13Merge branch 'rj/sequencer-sign-off-header-static'Libravatar Junio C Hamano1-1/+1
2019-02-11sequencer: make sign_off_header a file local symbolLibravatar Ramsay Jones1-1/+1
2019-02-06Merge branch 'nd/the-index-final'Libravatar Junio C Hamano1-20/+21
2019-02-06Merge branch 'en/rebase-merge-on-sequencer'Libravatar Junio C Hamano1-10/+13
2019-02-04config: allow giving separate author and committer identsLibravatar William Hubbs1-3/+2
2019-01-29Merge branch 'js/rebase-i-redo-exec'Libravatar Junio C Hamano1-3/+10
2019-01-29sequencer: refactor check_todo_list() to work on a todo_listLibravatar Alban Gruin1-98/+23
2019-01-29sequencer: introduce todo_list_write_to_file()Libravatar Alban Gruin1-20/+41
2019-01-29sequencer: refactor transform_todos() to work on a todo_listLibravatar Alban Gruin1-18/+36
2019-01-29sequencer: remove the 'arg' field from todo_itemLibravatar Alban Gruin1-29/+38
2019-01-18Merge branch 'so/cherry-pick-always-allow-m1'Libravatar Junio C Hamano1-3/+7
2019-01-18Merge branch 'nd/style-opening-brace'Libravatar Junio C Hamano1-2/+4
2019-01-14merge-recursive.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2019-01-14read-cache.c: kill read_index()Libravatar Nguyễn Thái Ngọc Duy1-10/+10
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 19:30:26 +0000