summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* hashmap_entry_init takes "struct hashmap_entry *"Eric Wong2019-10-071-2/+3
* Merge branch 'nd/tree-walk-with-repo'Junio C Hamano2019-07-191-3/+3
|\
| * Use the right 'struct repository' instead of the_repositoryNguyễn Thái Ngọc Duy2019-06-271-2/+2
| * tree-walk.c: remove the_repo from fill_tree_descriptor()Nguyễn Thái Ngọc Duy2019-06-271-1/+1
* | Merge branch 'ra/cherry-pick-revert-skip'Junio C Hamano2019-07-191-15/+119
|\ \
| * | cherry-pick/revert: advise using --skipRohit Ashiwal2019-07-021-3/+6
| * | cherry-pick/revert: add --skip optionRohit Ashiwal2019-07-021-0/+73
| * | sequencer: use argv_array in reset_mergeRohit Ashiwal2019-07-021-6/+11
| * | sequencer: rename reset_for_rollback to reset_mergeRohit Ashiwal2019-07-021-3/+3
| * | sequencer: add advice for revertRohit Ashiwal2019-07-021-6/+29
| |/
* | Merge branch 'pw/status-with-corrupt-sequencer-state'Junio C Hamano2019-07-191-22/+21
|\ \
| * | status: do not report errors in sequencer/todoPhillip Wood2019-06-271-16/+8
| * | sequencer: factor out todo command name parsingPhillip Wood2019-06-271-6/+13
| * | sequencer: always allow tab after command namePhillip Wood2019-06-271-1/+1
* | | Merge branch 'sg/rebase-progress'Junio C Hamano2019-07-091-3/+14
|\ \ \
| * | | rebase: fix garbled progress display with '-x'SZEDER Gábor2019-06-271-3/+14
| |/ /
* | | Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-091-3/+5
|\ \ \
* \ \ \ Merge branch 'pw/rebase-abort-clean-rewritten'Junio C Hamano2019-07-091-4/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | sequencer: return errors from sequencer_remove_state()Phillip Wood2019-05-151-4/+7
* | | | Merge branch 'pw/rebase-edit-message-for-replayed-merge'Junio C Hamano2019-06-131-0/+5
|\ \ \ \
| * | | | rebase -r: always reword merge -cPhillip Wood2019-05-191-0/+5
| | |_|/ | |/| |
* | | | sequencer: the `am` and `rebase--interactive` scripts are goneJohannes Schindelin2019-05-151-1/+1
|/ / /
* | | Merge branch 'pw/clean-sequencer-state-upon-final-commit'Junio C Hamano2019-05-131-0/+86
|\ \ \
| * | | fix cherry-pick/revert status after commitPhillip Wood2019-04-171-0/+35
| * | | commit/reset: try to clean up sequencer statePhillip Wood2019-04-171-0/+51
* | | | Merge branch 'pw/rebase-i-internal'Junio C Hamano2019-05-131-17/+25
|\ \ \ \ | | |/ / | |/| |
| * | | rebase -i: use struct commit when parsing optionsPhillip Wood2019-04-191-10/+11
| * | | sequencer: always discard index after checkoutPhillip Wood2019-04-191-10/+17
| * | | Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internalJunio C Hamano2019-04-191-418/+237
| |\ \ \ | | |_|/ | |/| |
* | | | Merge branch 'dl/merge-cleanup-scissors-fix'Junio C Hamano2019-05-091-6/+67
|\ \ \ \
| * | | | cherry-pick/revert: add scissors line on merge conflictDenton Liu2019-04-191-5/+11
| * | | | sequencer.c: save and restore cleanup modePhillip Wood2019-04-191-1/+27
| * | | | commit: extract cleanup_mode functions to sequencerDenton Liu2019-04-181-0/+29
* | | | | Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix'Junio C Hamano2019-05-091-7/+17
|\ \ \ \ \ | |/ / / /
| * | | | sequencer: fix cleanup with --signoff and -xPhillip Wood2019-04-181-7/+17
* | | | | Merge branch 'pw/cherry-pick-continue'Junio C Hamano2019-04-251-13/+40
|\ \ \ \ \
| * | | | | cherry-pick --continue: remember optionsPhillip Wood2019-03-181-0/+18
| * | | | | sequencer: break some long linesPhillip Wood2019-03-181-13/+22
| | |/ / / | |/| | |
* | | | | Merge branch 'ag/sequencer-reduce-rewriting-todo'Junio C Hamano2019-04-251-418/+237
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | rebase--interactive: move transform_todo_file()Alban Gruin2019-03-071-23/+0
| * | | sequencer: use edit_todo_list() in complete_action()Alban Gruin2019-03-071-14/+7
| * | | rebase-interactive: rewrite edit_todo_list() to handle the initial editAlban Gruin2019-03-071-2/+1
| * | | rebase-interactive: append_todo_help() changesAlban Gruin2019-03-071-13/+4
| * | | rebase-interactive: use todo_list_write_to_file() in edit_todo_list()Alban Gruin2019-03-071-2/+2
| * | | sequencer: refactor skip_unnecessary_picks() to work on a todo_listAlban Gruin2019-03-071-63/+19
| * | | rebase--interactive: move rearrange_squash_in_todo_file()Alban Gruin2019-03-071-27/+1
| * | | rebase--interactive: move sequencer_add_exec_commands()Alban Gruin2019-03-071-26/+2
| * | | sequencer: change complete_action() to use the refactored functionsAlban Gruin2019-03-071-45/+34
| * | | sequencer: make sequencer_make_script() write its script to a strbufAlban Gruin2019-03-071-23/+18
| * | | sequencer: refactor rearrange_squash() to work on a todo_listAlban Gruin2019-03-071-45/+47
View Lorry Controller Status