summaryrefslogtreecommitdiff
path: root/sequencer.h
Commit message (Expand)AuthorAgeFilesLines
* sequencer: fix edit handling for cherry-pick and revert messagesElijah Newren2021-03-311-2/+4
* Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano2020-11-181-0/+1
|\
| * merge,rebase,revert: select ort or recursive by config or environmentElijah Newren2020-11-021-0/+1
* | Merge branch 'pw/rebase-i-orig-head'Junio C Hamano2020-11-181-3/+4
|\ \
| * | rebase -i: use struct object_id when writing statePhillip Wood2020-11-041-1/+1
| * | rebase -i: use struct object_id rather than looking up commitPhillip Wood2020-11-041-2/+3
| |/
* | Merge branch 'jk/committer-date-is-author-date-fix-simplify'Junio C Hamano2020-11-091-2/+0
|\ \ | |/ |/|
| * am, sequencer: stop parsing our own committer identJeff King2020-10-261-2/+0
* | Merge branch 'pw/rebase-i-more-options'Junio C Hamano2020-09-031-0/+4
|\ \ | |/
| * rebase -i: support --ignore-datePhillip Wood2020-08-191-0/+1
| * rebase -i: support --committer-date-is-author-datePhillip Wood2020-08-171-0/+3
* | Merge branch 'dl/merge-autostash'Junio C Hamano2020-04-291-0/+20
|\ \
| * | sequencer: implement apply_autostash_oid()Denton Liu2020-04-101-0/+1
| * | sequencer: implement save_autostash()Denton Liu2020-04-101-0/+1
| * | sequencer: extract perform_autostash() from rebaseDenton Liu2020-04-101-0/+2
| * | rebase: use apply_autostash() from sequencer.cDenton Liu2020-04-101-0/+2
| * | sequencer: make read_oneliner() externDenton Liu2020-04-071-0/+14
* | | Merge branch 'jt/rebase-allow-duplicate'Junio C Hamano2020-04-221-1/+1
|\ \ \
| * | | rebase --merge: optionally skip upstreamed commitsJonathan Tan2020-04-111-1/+1
* | | | Merge branch 'en/rebase-no-keep-empty'Junio C Hamano2020-04-221-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | rebase: reinstate --no-keep-emptyElijah Newren2020-04-111-1/+1
| |/
* | Merge branch 'pw/advise-rebase-skip'Junio C Hamano2020-03-251-1/+2
|\ \ | |/ |/|
| * commit: encapsulate determine_whence() for sequencerPhillip Wood2019-12-061-1/+2
* | Merge branch 'en/rebase-backend'Junio C Hamano2020-03-021-1/+2
|\ \
| * | rebase (interactive-backend): fix handling of commits that become emptyElijah Newren2020-02-161-0/+1
| * | rebase (interactive-backend): make --keep-empty the defaultElijah Newren2020-02-161-1/+1
* | | Merge branch 'ag/edit-todo-drop-check'Junio C Hamano2020-02-141-1/+1
|\ \ \
| * | | rebase-interactive: warn if commit is dropped with `rebase --edit-todo'Alban Gruin2020-01-281-0/+1
| * | | sequencer: move check_todo_list_from_file() to rebase-interactive.cAlban Gruin2020-01-281-1/+0
| |/ /
* | | Merge branch 'ag/rebase-avoid-unneeded-checkout'Junio C Hamano2020-02-141-3/+0
|\ \ \ | |/ / |/| |
| * | rebase -i: stop checking out the tip of the branch to rebaseAlban Gruin2020-01-241-3/+0
* | | Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano2020-01-121-2/+0
* | | Merge branch 'ra/rebase-i-more-options'Junio C Hamano2019-12-101-0/+2
|\ \ \ | |_|/ |/| |
| * | rebase -i: support --ignore-dateRohit Ashiwal2019-11-021-0/+1
| * | rebase -i: support --committer-date-is-author-dateRohit Ashiwal2019-11-021-0/+1
* | | 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
|\ \ \
View Lorry Controller Status