summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)Author
4 daysMerge branch 'en/ort-readiness'Junio C Hamano
12 daysMerge branch 'en/sequencer-edit-upon-conflict-fix'Junio C Hamano
2021-03-31sequencer: fix edit handling for cherry-pick and revert messagesElijah Newren
2021-03-26Merge branch 'cm/rebase-i-fixup-amend-reword'Junio C Hamano
2021-03-26Merge branch 'cm/rebase-i-updates'Junio C Hamano
2021-03-26Merge branch 'cm/rebase-i'Junio C Hamano
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren
2021-03-15sequencer: export and rename subject_length()Charvi Mendiratta
2021-03-14use CALLOC_ARRAYRené Scharfe
2021-02-10Merge branch 'ds/more-index-cleanups'Junio C Hamano
2021-02-08sequencer: rename a few functionsCharvi Mendiratta
2021-02-08sequencer: fixup the datatype of the 'flag' argumentCharvi Mendiratta
2021-01-29rebase -i: teach --autosquash to work with amend!Charvi Mendiratta
2021-01-29rebase -i: add fixup [-C | -c] commandCharvi Mendiratta
2021-01-29sequencer: use const variable for commit message commentsCharvi Mendiratta
2021-01-29sequencer: pass todo_item to do_pick_commit()Charvi Mendiratta
2021-01-29rebase -i: comment out squash!/fixup! subjects from squash messagePhillip Wood
2021-01-28rebase -i: do leave commit message intact in fixup! chainsJohannes Schindelin
2021-01-24cache-tree: clean up cache_tree_update()Derrick Stolee
2021-01-21sequencer: factor out code to append squash messagePhillip Wood
2021-01-21rebase -i: only write fixup-message when it's neededPhillip Wood
2020-11-21Merge branch 'en/strmap'Junio C Hamano
2020-11-18Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano
2020-11-18Merge branch 'pw/rebase-i-orig-head'Junio C Hamano
2020-11-11Merge branch 'jc/sequencer-stopped-sha-simplify'Junio C Hamano
2020-11-09Merge branch 'jk/committer-date-is-author-date-fix-simplify'Junio C Hamano
2020-11-04rebase -i: use struct object_id when writing statePhillip Wood
2020-11-04rebase -i: use struct object_id rather than looking up commitPhillip Wood
2020-11-03merge,rebase,revert: select ort or recursive by config or environmentElijah Newren
2020-11-02Merge branch 'en/sequencer-rollback-lock-cleanup'Junio C Hamano
2020-11-02Merge branch 'sc/sequencer-gpg-octopus'Junio C Hamano
2020-11-02hashmap: provide deallocation function namesElijah Newren
2020-10-26Merge branch 'jk/committer-date-is-author-date-fix'Junio C Hamano
2020-10-26am, sequencer: stop parsing our own committer identJeff King
2020-10-23rebase: fix broken email with --committer-date-is-author-dateJeff King
2020-10-22sequencer: tolerate abbreviated stopped-sha fileJonathan Tan
2020-10-21sequencer: remove duplicate rollback_lock_file() callElijah Newren
2020-10-18sequencer: pass explicit --no-gpg-sign to mergeSamuel Čavoj
2020-10-18sequencer: fix gpg option passed to merge subcommandSamuel Čavoj
2020-10-05Merge branch 'jk/unused'Junio C Hamano
2020-10-04Merge branch 'jc/sequencer-stopped-sha-simplify'Junio C Hamano
2020-09-30sequencer: handle ignore_footer when parsing trailersJeff King
2020-09-30sequencer: drop repository argument from run_git_commit()Jeff King
2020-09-25sequencer: stop abbreviating stopped-sha fileJunio C Hamano
2020-09-03Merge branch 'pw/rebase-i-more-options'Junio C Hamano
2020-08-31Merge branch 'hn/refs-pseudorefs'Junio C Hamano
2020-08-21sequencer: treat REVERT_HEAD as a pseudo refHan-Wen Nienhuys
2020-08-21sequencer: treat CHERRY_PICK_HEAD as a pseudo refHan-Wen Nienhuys
2020-08-19Merge branch 'ak/sequencer-fix-find-uniq-abbrev'Junio C Hamano
2020-08-19Merge branch 'en/sequencer-merge-labels'Junio C Hamano