summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2019-08-19rebase -i: always update HEAD before rewordingLibravatar Phillip Wood1-8/+11
2019-08-19sequencer: convert to use the_hash_algoLibravatar brian m. carlson1-3/+3
2019-08-19merge-recursive: don't force external callers to do our loggingLibravatar Elijah Newren1-1/+0
2019-08-19merge-recursive: remove useless parameter in merge_trees()Libravatar Elijah Newren1-2/+2
2019-07-31rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`Libravatar Johannes Schindelin1-1/+3
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-07-29Merge branch 'pw/rebase-abort-clean-rewritten' into maintLibravatar Junio C Hamano1-4/+7
2019-07-19Merge branch 'nd/tree-walk-with-repo'Libravatar Junio C Hamano1-3/+3
2019-07-19Merge branch 'ra/cherry-pick-revert-skip'Libravatar Junio C Hamano1-15/+119
2019-07-19Merge branch 'pw/status-with-corrupt-sequencer-state'Libravatar Junio C Hamano1-22/+21
2019-07-09Merge branch 'sg/rebase-progress'Libravatar Junio C Hamano1-3/+14
2019-07-09Merge branch 'nd/switch-and-restore'Libravatar Junio C Hamano1-3/+5
2019-07-09Merge branch 'pw/rebase-abort-clean-rewritten'Libravatar Junio C Hamano1-4/+7
2019-07-02cherry-pick/revert: advise using --skipLibravatar Rohit Ashiwal1-3/+6
2019-07-02cherry-pick/revert: add --skip optionLibravatar Rohit Ashiwal1-0/+73
2019-07-02sequencer: use argv_array in reset_mergeLibravatar Rohit Ashiwal1-6/+11
2019-07-02sequencer: rename reset_for_rollback to reset_mergeLibravatar Rohit Ashiwal1-3/+3
2019-07-02sequencer: add advice for revertLibravatar Rohit Ashiwal1-6/+29
2019-06-27rebase: fix garbled progress display with '-x'Libravatar SZEDER Gábor1-3/+14
2019-06-27Use the right 'struct repository' instead of the_repositoryLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2019-06-27tree-walk.c: remove the_repo from fill_tree_descriptor()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-06-27status: do not report errors in sequencer/todoLibravatar Phillip Wood1-16/+8
2019-06-27sequencer: factor out todo command name parsingLibravatar Phillip Wood1-6/+13
2019-06-27sequencer: always allow tab after command nameLibravatar Phillip Wood1-1/+1
2019-06-13Merge branch 'pw/rebase-edit-message-for-replayed-merge'Libravatar Junio C Hamano1-0/+5
2019-05-19rebase -r: always reword merge -cLibravatar Phillip Wood1-0/+5
2019-05-15sequencer: return errors from sequencer_remove_state()Libravatar Phillip Wood1-4/+7
2019-05-15sequencer: 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 16:10:33 +0000