summaryrefslogtreecommitdiff
path: root/sequencer.h
AgeCommit message (Expand)AuthorFilesLines
2020-11-18Merge branch 'en/merge-ort-api-null-impl'Libravatar Junio C Hamano1-0/+1
2020-11-18Merge branch 'pw/rebase-i-orig-head'Libravatar Junio C Hamano1-3/+4
2020-11-09Merge branch 'jk/committer-date-is-author-date-fix-simplify'Libravatar Junio C Hamano1-2/+0
2020-11-04rebase -i: use struct object_id when writing stateLibravatar Phillip Wood1-1/+1
2020-11-04rebase -i: use struct object_id rather than looking up commitLibravatar Phillip Wood1-2/+3
2020-11-02merge,rebase,revert: select ort or recursive by config or environmentLibravatar Elijah Newren1-0/+1
2020-10-26am, sequencer: stop parsing our own committer identLibravatar Jeff King1-2/+0
2020-09-03Merge branch 'pw/rebase-i-more-options'Libravatar Junio C Hamano1-0/+4
2020-08-19rebase -i: support --ignore-dateLibravatar Phillip Wood1-0/+1
2020-08-17rebase -i: support --committer-date-is-author-dateLibravatar Phillip Wood1-0/+3
2020-04-29Merge branch 'dl/merge-autostash'Libravatar Junio C Hamano1-0/+20
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Libravatar Junio C Hamano1-1/+1
2020-04-22Merge branch 'en/rebase-no-keep-empty'Libravatar Junio C Hamano1-1/+1
2020-04-11rebase --merge: optionally skip upstreamed commitsLibravatar Jonathan Tan1-1/+1
2020-04-11rebase: reinstate --no-keep-emptyLibravatar Elijah Newren1-1/+1
2020-04-10sequencer: implement apply_autostash_oid()Libravatar Denton Liu1-0/+1
2020-04-10sequencer: implement save_autostash()Libravatar Denton Liu1-0/+1
2020-04-10sequencer: extract perform_autostash() from rebaseLibravatar Denton Liu1-0/+2
2020-04-10rebase: use apply_autostash() from sequencer.cLibravatar Denton Liu1-0/+2
2020-04-07sequencer: make read_oneliner() externLibravatar Denton Liu1-0/+14
2020-03-25Merge branch 'pw/advise-rebase-skip'Libravatar Junio C Hamano1-1/+2
2020-03-02Merge branch 'en/rebase-backend'Libravatar Junio C Hamano1-1/+2
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyLibravatar Elijah Newren1-0/+1
2020-02-16rebase (interactive-backend): make --keep-empty the defaultLibravatar Elijah Newren1-1/+1
2020-02-14Merge branch 'ag/edit-todo-drop-check'Libravatar Junio C Hamano1-1/+1
2020-02-14Merge branch 'ag/rebase-avoid-unneeded-checkout'Libravatar Junio C Hamano1-3/+0
2020-01-28rebase-interactive: warn if commit is dropped with `rebase --edit-todo'Libravatar Alban Gruin1-0/+1
2020-01-28sequencer: move check_todo_list_from_file() to rebase-interactive.cLibravatar Alban Gruin1-1/+0
2020-01-24rebase -i: stop checking out the tip of the branch to rebaseLibravatar Alban Gruin1-3/+0
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Libravatar Junio C Hamano1-2/+0
2019-12-10Merge branch 'ra/rebase-i-more-options'Libravatar Junio C Hamano1-0/+2
2019-12-06commit: encapsulate determine_whence() for sequencerLibravatar Phillip Wood1-1/+2
2019-11-10Merge branch 'pw/post-commit-from-sequencer'Libravatar Junio C Hamano1-2/+1
2019-11-02rebase -i: support --ignore-dateLibravatar Rohit Ashiwal1-0/+1
2019-11-02rebase -i: support --committer-date-is-author-dateLibravatar Rohit Ashiwal1-0/+1
2019-10-16sequencer.h fix placement of #endifLibravatar Phillip Wood1-2/+1
2019-09-18Merge branch 'js/rebase-r-strategy'Libravatar Junio C Hamano1-0/+6
2019-07-31rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`Libravatar Johannes Schindelin1-0/+6
2019-07-19Merge branch 'ra/cherry-pick-revert-skip'Libravatar Junio C Hamano1-0/+1
2019-07-09Merge branch 'nd/switch-and-restore'Libravatar Junio C Hamano1-1/+1
2019-07-02cherry-pick/revert: add --skip optionLibravatar Rohit Ashiwal1-0/+1
2019-05-13Merge branch 'pw/clean-sequencer-state-upon-final-commit'Libravatar Junio C Hamano1-0/+3
2019-05-13Merge branch 'pw/rebase-i-internal'Libravatar Junio C Hamano1-3/+4
2019-05-09Merge branch 'dl/merge-cleanup-scissors-fix'Libravatar Junio C Hamano1-1/+8
2019-05-09Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix'Libravatar Junio C Hamano1-0/+1
2019-04-25Merge branch 'ag/sequencer-reduce-rewriting-todo'Libravatar Junio C Hamano1-17/+64
2019-04-19rebase -i: use struct commit when parsing optionsLibravatar Phillip Wood1-2/+2
2019-04-19sequencer: always discard index after checkoutLibravatar Phillip Wood1-1/+2
2019-04-19Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internalLibravatar Junio C Hamano1-17/+64
2019-04-19cherry-pick/revert: add scissors line on merge conflictLibravatar Denton Liu1-1/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 15:55:15 +0000