summaryrefslogtreecommitdiffstats
path: root/sequencer.h (follow)
Commit message (Expand)AuthorAgeLines
* Merge branch 'js/retire-preserve-merges'Junio C Hamano2021-10-18-2/+0
|\
| * sequencer: restrict scope of a formerly public functionJohannes Schindelin2021-09-07-2/+0
* | Merge branch 'ab/designated-initializers'Junio C Hamano2021-10-11-1/+3
|\ \
| * | *.h: move some *_INIT to designated initializersÆvar Arnfjörð Bjarmason2021-09-27-1/+3
* | | Merge branch 'pw/rebase-reread-todo-after-editing'Junio C Hamano2021-10-06-1/+0
|\ \ \ | |/ / |/| |
| * | rebase: fix todo-list rereadingPhillip Wood2021-09-24-1/+0
| |/
* / sequencer: advise if skipping cherry-picked commitJosh Steadmon2021-08-30-0/+1
|/
* sequencer: fix edit handling for cherry-pick and revert messagesElijah Newren2021-03-31-2/+4
* Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano2020-11-18-0/+1
|\
| * merge,rebase,revert: select ort or recursive by config or environmentElijah Newren2020-11-02-0/+1
* | Merge branch 'pw/rebase-i-orig-head'Junio C Hamano2020-11-18-3/+4
|\ \
| * | rebase -i: use struct object_id when writing statePhillip Wood2020-11-04-1/+1
| * | rebase -i: use struct object_id rather than looking up commitPhillip Wood2020-11-04-2/+3
| |/
* | Merge branch 'jk/committer-date-is-author-date-fix-simplify'Junio C Hamano2020-11-09-2/+0
|\ \ | |/ |/|
| * am, sequencer: stop parsing our own committer identJeff King2020-10-26-2/+0
* | Merge branch 'pw/rebase-i-more-options'Junio C Hamano2020-09-03-0/+4
|\|
| * rebase -i: support --ignore-datePhillip Wood2020-08-19-0/+1
| * rebase -i: support --committer-date-is-author-datePhillip Wood2020-08-17-0/+3
* | Merge branch 'dl/merge-autostash'Junio C Hamano2020-04-29-0/+20
|\ \
| * | sequencer: implement apply_autostash_oid()Denton Liu2020-04-10-0/+1
| * | sequencer: implement save_autostash()Denton Liu2020-04-10-0/+1
| * | sequencer: extract perform_autostash() from rebaseDenton Liu2020-04-10-0/+2
| * | rebase: use apply_autostash() from sequencer.cDenton Liu2020-04-10-0/+2
| * | sequencer: make read_oneliner() externDenton Liu2020-04-07-0/+14
* | | Merge branch 'jt/rebase-allow-duplicate'Junio C Hamano2020-04-22-1/+1
|\ \ \
| * | | rebase --merge: optionally skip upstreamed commitsJonathan Tan2020-04-11-1/+1
* | | | Merge branch 'en/rebase-no-keep-empty'Junio C Hamano2020-04-22-1/+1
|\| | | | |_|/ |/| |
| * | rebase: reinstate --no-keep-emptyElijah Newren2020-04-11-1/+1
| |/
* | Merge branch 'pw/advise-rebase-skip'Junio C Hamano2020-03-25-1/+2
|\ \ | |/ |/|
| * commit: encapsulate determine_whence() for sequencerPhillip Wood2019-12-06-1/+2
* | Merge branch 'en/rebase-backend'Junio C Hamano2020-03-02-1/+2
|\ \
| * | rebase (interactive-backend): fix handling of commits that become emptyElijah Newren2020-02-16-0/+1
| * | rebase (interactive-backend): make --keep-empty the defaultElijah Newren2020-02-16-1/+1
* | | Merge branch 'ag/edit-todo-drop-check'Junio C Hamano2020-02-14-1/+1
|\ \ \
| * | | rebase-interactive: warn if commit is dropped with `rebase --edit-todo'Alban Gruin2020-01-28-0/+1
| * | | sequencer: move check_todo_list_from_file() to rebase-interactive.cAlban Gruin2020-01-28-1/+0
| |/ /
* | | Merge branch 'ag/rebase-avoid-unneeded-checkout'Junio C Hamano2020-02-14-3/+0
|\ \ \ | |/ / |/| |
| * | rebase -i: stop checking out the tip of the branch to rebaseAlban Gruin2020-01-24-3/+0
* | | Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano2020-01-12-2/+0
* | | Merge branch 'ra/rebase-i-more-options'Junio C Hamano2019-12-10-0/+2
|\ \ \ | |_|/ |/| |
| * | rebase -i: support --ignore-dateRohit Ashiwal2019-11-02-0/+1
| * | rebase -i: support --committer-date-is-author-dateRohit Ashiwal2019-11-02-0/+1
* | | Merge branch 'pw/post-commit-from-sequencer'Junio C Hamano2019-11-10-2/+1
|\ \ \
| * | | sequencer.h fix placement of #endifPhillip Wood2019-10-16-2/+1
| |/ /
* | | Merge branch 'js/rebase-r-strategy'Junio C Hamano2019-09-18-0/+6
|\ \ \ | |_|/ |/| |
| * | rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`Johannes Schindelin2019-07-31-0/+6
| |/
* | Merge branch 'ra/cherry-pick-revert-skip'Junio C Hamano2019-07-19-0/+1
|\ \
| * | cherry-pick/revert: add --skip optionRohit Ashiwal2019-07-02-0/+1
| |/
* | Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-09-1/+1
|\ \ | |/ |/|
* | Merge branch 'pw/clean-sequencer-state-upon-final-commit'Junio C Hamano2019-05-13-0/+3
|\ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-18 11:30:09 +0000