summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2021-01-23cache-tree: clean up cache_tree_update()Libravatar Derrick Stolee1-3/+0
2021-01-20sequencer: factor out code to append squash messageLibravatar Phillip Wood1-6/+12
2021-01-20rebase -i: only write fixup-message when it's neededLibravatar Phillip Wood1-4/+3
2020-11-21Merge branch 'en/strmap'Libravatar Junio C Hamano1-2/+2
2020-11-18Merge branch 'en/merge-ort-api-null-impl'Libravatar Junio C Hamano1-11/+61
2020-11-18Merge branch 'pw/rebase-i-orig-head'Libravatar Junio C Hamano1-9/+6
2020-11-11Merge branch 'jc/sequencer-stopped-sha-simplify'Libravatar Junio C Hamano1-1/+1
2020-11-09Merge branch 'jk/committer-date-is-author-date-fix-simplify'Libravatar Junio C Hamano1-26/+2
2020-11-04rebase -i: use struct object_id when writing stateLibravatar Phillip Wood1-2/+3
2020-11-04rebase -i: use struct object_id rather than looking up commitLibravatar Phillip Wood1-7/+3
2020-11-02merge,rebase,revert: select ort or recursive by config or environmentLibravatar Elijah Newren1-11/+61
2020-11-02Merge branch 'en/sequencer-rollback-lock-cleanup'Libravatar Junio C Hamano1-1/+0
2020-11-02Merge branch 'sc/sequencer-gpg-octopus'Libravatar Junio C Hamano1-1/+3
2020-11-02hashmap: provide deallocation function namesLibravatar Elijah Newren1-2/+2
2020-10-26Merge branch 'jk/committer-date-is-author-date-fix'Libravatar Junio C Hamano1-1/+1
2020-10-26am, sequencer: stop parsing our own committer identLibravatar Jeff King1-26/+2
2020-10-23rebase: fix broken email with --committer-date-is-author-dateLibravatar Jeff King1-1/+1
2020-10-21sequencer: tolerate abbreviated stopped-sha fileLibravatar Jonathan Tan1-1/+1
2020-10-21sequencer: remove duplicate rollback_lock_file() callLibravatar Elijah Newren1-1/+0
2020-10-18sequencer: pass explicit --no-gpg-sign to mergeLibravatar Samuel Čavoj1-0/+2
2020-10-18sequencer: fix gpg option passed to merge subcommandLibravatar Samuel Čavoj1-1/+1
2020-10-05Merge branch 'jk/unused'Libravatar Junio C Hamano1-6/+14
2020-10-04Merge branch 'jc/sequencer-stopped-sha-simplify'Libravatar Junio C Hamano1-5/+6
2020-09-30sequencer: handle ignore_footer when parsing trailersLibravatar Jeff King1-0/+9
2020-09-30sequencer: drop repository argument from run_git_commit()Libravatar Jeff King1-6/+5
2020-09-25sequencer: stop abbreviating stopped-sha fileLibravatar Junio C Hamano1-5/+6
2020-09-03Merge branch 'pw/rebase-i-more-options'Libravatar Junio C Hamano1-4/+126
2020-08-31Merge branch 'hn/refs-pseudorefs'Libravatar Junio C Hamano1-22/+34
2020-08-21sequencer: treat REVERT_HEAD as a pseudo refLibravatar Han-Wen Nienhuys1-7/+9
2020-08-21sequencer: treat CHERRY_PICK_HEAD as a pseudo refLibravatar Han-Wen Nienhuys1-16/+26
2020-08-19Merge branch 'ak/sequencer-fix-find-uniq-abbrev'Libravatar Junio C Hamano1-2/+3
2020-08-19Merge branch 'en/sequencer-merge-labels'Libravatar Junio C Hamano1-1/+1
2020-08-19rebase -i: support --ignore-dateLibravatar Phillip Wood1-12/+54
2020-08-17rebase -i: support --committer-date-is-author-dateLibravatar Phillip Wood1-3/+83
2020-08-17am: stop exporting GIT_COMMITTER_DATELibravatar Phillip Wood1-2/+2
2020-08-14sequencer: avoid garbled merge machinery messages due to commit labelsLibravatar Elijah Newren1-1/+1
2020-08-13rebase -i: fix possibly wrong onto hash in todoLibravatar Antti Keränen1-2/+3
2020-07-30strvec: rename struct fieldsLibravatar Jeff King1-2/+2
2020-07-28strvec: fix indentation in renamed callsLibravatar Jeff King1-4/+4
2020-07-28strvec: convert remaining callers away from argv_array nameLibravatar Jeff King1-56/+56
2020-07-28strvec: rename files from argv-array to strvecLibravatar Jeff King1-1/+1
2020-05-14Merge branch 'js/rebase-autosquash-double-fixup-fix'Libravatar Junio C Hamano1-2/+5
2020-05-09rebase --autosquash: fix a potential segfaultLibravatar Johannes Schindelin1-2/+5
2020-04-29Merge branch 'dl/merge-autostash'Libravatar Junio C Hamano1-47/+129
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Libravatar Junio C Hamano1-1/+2
2020-04-22Merge branch 'en/rebase-no-keep-empty'Libravatar Junio C Hamano1-0/+11
2020-04-22Merge branch 'dd/no-gpg-sign'Libravatar Junio C Hamano1-0/+2
2020-04-22Merge branch 'en/sequencer-reflog-action'Libravatar Junio C Hamano1-2/+8
2020-04-22Merge branch 'ag/rebase-merge-allow-ff-under-abbrev-command'Libravatar Junio C Hamano1-3/+6
2020-04-11rebase --merge: optionally skip upstreamed commitsLibravatar Jonathan Tan1-1/+2