summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2021-05-07Merge branch 'ab/rebase-no-reschedule-failed-exec'Libravatar Junio C Hamano1-0/+5
2021-04-27hash: provide per-algorithm null OIDsLibravatar brian m. carlson1-2/+2
2021-04-16Merge branch 'en/ort-readiness'Libravatar Junio C Hamano1-0/+5
2021-04-10rebase: don't override --no-reschedule-failed-exec with configLibravatar Ævar Arnfjörð Bjarmason1-0/+5
2021-04-08Merge branch 'en/sequencer-edit-upon-conflict-fix'Libravatar Junio C Hamano1-11/+41
2021-03-31sequencer: fix edit handling for cherry-pick and revert messagesLibravatar Elijah Newren1-11/+41
2021-03-26Merge branch 'cm/rebase-i-fixup-amend-reword'Libravatar Junio C Hamano1-15/+1
2021-03-26Merge branch 'cm/rebase-i-updates'Libravatar Junio C Hamano1-12/+11
2021-03-26Merge branch 'cm/rebase-i'Libravatar Junio C Hamano1-39/+256
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictLibravatar Elijah Newren1-0/+5
2021-03-15sequencer: export and rename subject_length()Libravatar Charvi Mendiratta1-15/+1
2021-03-13use CALLOC_ARRAYLibravatar René Scharfe1-1/+1
2021-02-10Merge branch 'ds/more-index-cleanups'Libravatar Junio C Hamano1-3/+0
2021-02-08sequencer: rename a few functionsLibravatar Charvi Mendiratta1-9/+9
2021-02-08sequencer: fixup the datatype of the 'flag' argumentLibravatar Charvi Mendiratta1-4/+3
2021-01-29rebase -i: teach --autosquash to work with amend!Libravatar Charvi Mendiratta1-7/+16
2021-01-29rebase -i: add fixup [-C | -c] commandLibravatar Charvi Mendiratta1-19/+194
2021-01-29sequencer: use const variable for commit message commentsLibravatar Charvi Mendiratta1-5/+10
2021-01-29sequencer: pass todo_item to do_pick_commit()Libravatar Charvi Mendiratta1-7/+11
2021-01-29rebase -i: comment out squash!/fixup! subjects from squash messageLibravatar Phillip Wood1-1/+20
2021-01-28rebase -i: do leave commit message intact in fixup! chainsLibravatar Johannes Schindelin1-1/+12
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 20:58:08 +0000