summaryrefslogtreecommitdiff
path: root/sequencer.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/post-commit-from-sequencer'Junio C Hamano2019-11-101-2/+1
|\
| * sequencer.h fix placement of #endifPhillip Wood2019-10-161-2/+1
* | Merge branch 'js/rebase-r-strategy'Junio C Hamano2019-09-181-0/+6
|\ \
| * | rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`Johannes Schindelin2019-07-311-0/+6
| |/
* | Merge branch 'ra/cherry-pick-revert-skip'Junio C Hamano2019-07-191-0/+1
|\ \
| * | cherry-pick/revert: add --skip optionRohit Ashiwal2019-07-021-0/+1
| |/
* | Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-091-1/+1
|\ \ | |/ |/|
* | Merge branch 'pw/clean-sequencer-state-upon-final-commit'Junio C Hamano2019-05-131-0/+3
|\ \
| * | fix cherry-pick/revert status after commitPhillip Wood2019-04-171-0/+2
| * | commit/reset: try to clean up sequencer statePhillip Wood2019-04-171-0/+1
| |/
* | Merge branch 'pw/rebase-i-internal'Junio C Hamano2019-05-131-3/+4
|\ \
| * | rebase -i: use struct commit when parsing optionsPhillip Wood2019-04-191-2/+2
| * | sequencer: always discard index after checkoutPhillip Wood2019-04-191-1/+2
| * | Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internalJunio C Hamano2019-04-191-17/+64
| |\ \ | | |/ | |/|
* | | Merge branch 'dl/merge-cleanup-scissors-fix'Junio C Hamano2019-05-091-1/+8
|\ \ \
| * | | cherry-pick/revert: add scissors line on merge conflictDenton Liu2019-04-191-1/+2
| * | | commit: extract cleanup_mode functions to sequencerDenton Liu2019-04-181-0/+6
* | | | Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix'Junio C Hamano2019-05-091-0/+1
|\ \ \ \ | |/ / /
| * | | sequencer: fix cleanup with --signoff and -xPhillip Wood2019-04-181-0/+1
| |/ /
* | | Merge branch 'ag/sequencer-reduce-rewriting-todo'Junio C Hamano2019-04-251-17/+64
|\ \ \ | |/ / |/| / | |/
| * rebase--interactive: move transform_todo_file()Alban Gruin2019-03-071-1/+0
| * rebase-interactive: rewrite edit_todo_list() to handle the initial editAlban Gruin2019-03-071-0/+1
| * rebase-interactive: use todo_list_write_to_file() in edit_todo_list()Alban Gruin2019-03-071-3/+0
| * rebase--interactive: move rearrange_squash_in_todo_file()Alban Gruin2019-03-071-1/+1
| * rebase--interactive: move sequencer_add_exec_commands()Alban Gruin2019-03-071-2/+2
| * sequencer: change complete_action() to use the refactored functionsAlban Gruin2019-03-071-1/+1
| * sequencer: make sequencer_make_script() write its script to a strbufAlban Gruin2019-03-071-3/+2
| * sequencer: refactor rearrange_squash() to work on a todo_listAlban Gruin2019-03-071-1/+1
| * sequencer: refactor sequencer_add_exec_commands() to work on a todo_listAlban Gruin2019-03-071-2/+3
| * sequencer: refactor check_todo_list() to work on a todo_listAlban Gruin2019-01-291-8/+1
| * sequencer: introduce todo_list_write_to_file()Alban Gruin2019-01-291-4/+7
| * sequencer: refactor transform_todos() to work on a todo_listAlban Gruin2019-01-291-1/+3
| * sequencer: remove the 'arg' field from todo_itemAlban Gruin2019-01-291-2/+4
| * sequencer: make the todo_list structure publicAlban Gruin2019-01-081-0/+50
* | Merge branch 'rj/sequencer-sign-off-header-static'Junio C Hamano2019-02-131-2/+0
|\ \
| * | sequencer: make sign_off_header a file local symbolRamsay Jones2019-02-111-2/+0
* | | Merge branch 'nd/the-index-final'Junio C Hamano2019-02-061-1/+2
|\ \ \
| * | | notes-utils.c: remove the_repository referencesNguyễn Thái Ngọc Duy2019-01-141-1/+2
| | |/ | |/|
* | | Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano2019-02-061-0/+1
|\ \ \
| * | | git-rebase, sequencer: extend --quiet option for the interactive machineryElijah Newren2018-12-281-0/+1
* | | | Merge branch 'js/rebase-i-redo-exec'Junio C Hamano2019-01-291-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | rebase: introduce --reschedule-failed-execJohannes Schindelin2018-12-111-0/+1
| |/ /
* | | Merge branch 'nd/the-index'Junio C Hamano2019-01-041-11/+16
|\ \ \ | |/ / |/| |
| * | sequencer.c: remove implicit dependency on the_repositoryNguyễn Thái Ngọc Duy2018-11-121-6/+6
| * | sequencer.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-11-121-5/+10
* | | Merge branch 'pw/am-rebase-read-author-script'Junio C Hamano2018-11-131-0/+3
|\ \ \ | |/ / |/| |
| * | add read_author_script() to libgitPhillip Wood2018-11-011-0/+3
* | | Merge branch 'ag/rebase-i-in-c'Junio C Hamano2018-11-021-1/+21
|\ \ \ | |/ / |/| |
| * | rebase -i: rewrite write_basic_state() in CAlban Gruin2018-08-291-0/+4
| * | rebase -i: remove unused modes and functionsAlban Gruin2018-08-291-4/+0
View Lorry Controller Status