summaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorLines
2020-11-21Merge branch 'en/strmap'Junio C Hamano-2/+2
2020-11-18Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano-11/+61
2020-11-18Merge branch 'pw/rebase-i-orig-head'Junio C Hamano-9/+6
2020-11-11Merge branch 'jc/sequencer-stopped-sha-simplify'Junio C Hamano-1/+1
2020-11-09Merge branch 'jk/committer-date-is-author-date-fix-simplify'Junio C Hamano-26/+2
2020-11-04rebase -i: use struct object_id when writing statePhillip Wood-2/+3
2020-11-04rebase -i: use struct object_id rather than looking up commitPhillip Wood-7/+3
2020-11-02merge,rebase,revert: select ort or recursive by config or environmentElijah Newren-11/+61
2020-11-02Merge branch 'en/sequencer-rollback-lock-cleanup'Junio C Hamano-1/+0
2020-11-02Merge branch 'sc/sequencer-gpg-octopus'Junio C Hamano-1/+3
2020-11-02hashmap: provide deallocation function namesElijah Newren-2/+2
2020-10-26Merge branch 'jk/committer-date-is-author-date-fix'Junio C Hamano-1/+1
2020-10-26am, sequencer: stop parsing our own committer identJeff King-26/+2
2020-10-23rebase: fix broken email with --committer-date-is-author-dateJeff King-1/+1
2020-10-21sequencer: tolerate abbreviated stopped-sha fileJonathan Tan-1/+1
2020-10-21sequencer: remove duplicate rollback_lock_file() callElijah Newren-1/+0
2020-10-18sequencer: pass explicit --no-gpg-sign to mergeSamuel Čavoj-0/+2
2020-10-18sequencer: fix gpg option passed to merge subcommandSamuel Čavoj-1/+1
2020-10-05Merge branch 'jk/unused'Junio C Hamano-6/+14
2020-10-04Merge branch 'jc/sequencer-stopped-sha-simplify'Junio C Hamano-5/+6
2020-09-30sequencer: handle ignore_footer when parsing trailersJeff King-0/+9
2020-09-30sequencer: drop repository argument from run_git_commit()Jeff King-6/+5
2020-09-25sequencer: stop abbreviating stopped-sha fileJunio C Hamano-5/+6
2020-09-03Merge branch 'pw/rebase-i-more-options'Junio C Hamano-4/+126
2020-08-31Merge branch 'hn/refs-pseudorefs'Junio C Hamano-22/+34
2020-08-21sequencer: treat REVERT_HEAD as a pseudo refHan-Wen Nienhuys-7/+9
2020-08-21sequencer: treat CHERRY_PICK_HEAD as a pseudo refHan-Wen Nienhuys-16/+26
2020-08-19Merge branch 'ak/sequencer-fix-find-uniq-abbrev'Junio C Hamano-2/+3
2020-08-19Merge branch 'en/sequencer-merge-labels'Junio C Hamano-1/+1
2020-08-19rebase -i: support --ignore-datePhillip Wood-12/+54
2020-08-17rebase -i: support --committer-date-is-author-datePhillip Wood-3/+83
2020-08-17am: stop exporting GIT_COMMITTER_DATEPhillip Wood-2/+2
2020-08-14sequencer: avoid garbled merge machinery messages due to commit labelsElijah Newren-1/+1
2020-08-13rebase -i: fix possibly wrong onto hash in todoAntti Keränen-2/+3
2020-07-30strvec: rename struct fieldsJeff King-2/+2
2020-07-28strvec: fix indentation in renamed callsJeff King-4/+4
2020-07-28strvec: convert remaining callers away from argv_array nameJeff King-56/+56
2020-07-28strvec: rename files from argv-array to strvecJeff King-1/+1
2020-05-14Merge branch 'js/rebase-autosquash-double-fixup-fix'Junio C Hamano-2/+5
2020-05-09rebase --autosquash: fix a potential segfaultJohannes Schindelin-2/+5
2020-04-29Merge branch 'dl/merge-autostash'Junio C Hamano-47/+129
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Junio C Hamano-1/+2
2020-04-22Merge branch 'en/rebase-no-keep-empty'Junio C Hamano-0/+11
2020-04-22Merge branch 'dd/no-gpg-sign'Junio C Hamano-0/+2
2020-04-22Merge branch 'en/sequencer-reflog-action'Junio C Hamano-2/+8
2020-04-22Merge branch 'ag/rebase-merge-allow-ff-under-abbrev-command'Junio C Hamano-3/+6
2020-04-11rebase --merge: optionally skip upstreamed commitsJonathan Tan-1/+2
2020-04-11rebase: reinstate --no-keep-emptyElijah Newren-0/+6
2020-04-11rebase -i: mark commits that begin empty in todo editorElijah Newren-0/+5
2020-04-10sequencer: implement apply_autostash_oid()Denton Liu-12/+26