summaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorLines
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano-2/+2
2021-05-07Merge branch 'ab/rebase-no-reschedule-failed-exec'Junio C Hamano-0/+5
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson-2/+2
2021-04-16Merge branch 'en/ort-readiness'Junio C Hamano-0/+5
2021-04-10rebase: don't override --no-reschedule-failed-exec with configÆvar Arnfjörð Bjarmason-0/+5
2021-04-08Merge branch 'en/sequencer-edit-upon-conflict-fix'Junio C Hamano-11/+41
2021-03-31sequencer: fix edit handling for cherry-pick and revert messagesElijah Newren-11/+41
2021-03-26Merge branch 'cm/rebase-i-fixup-amend-reword'Junio C Hamano-15/+1
2021-03-26Merge branch 'cm/rebase-i-updates'Junio C Hamano-12/+11
2021-03-26Merge branch 'cm/rebase-i'Junio C Hamano-39/+256
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren-0/+5
2021-03-15sequencer: export and rename subject_length()Charvi Mendiratta-15/+1
2021-03-13use CALLOC_ARRAYRené Scharfe-1/+1
2021-02-10Merge branch 'ds/more-index-cleanups'Junio C Hamano-3/+0
2021-02-08sequencer: rename a few functionsCharvi Mendiratta-9/+9
2021-02-08sequencer: fixup the datatype of the 'flag' argumentCharvi Mendiratta-4/+3
2021-01-29rebase -i: teach --autosquash to work with amend!Charvi Mendiratta-7/+16
2021-01-29rebase -i: add fixup [-C | -c] commandCharvi Mendiratta-19/+194
2021-01-29sequencer: use const variable for commit message commentsCharvi Mendiratta-5/+10
2021-01-29sequencer: pass todo_item to do_pick_commit()Charvi Mendiratta-7/+11
2021-01-29rebase -i: comment out squash!/fixup! subjects from squash messagePhillip Wood-1/+20
2021-01-28rebase -i: do leave commit message intact in fixup! chainsJohannes Schindelin-1/+12
2021-01-23cache-tree: clean up cache_tree_update()Derrick Stolee-3/+0
2021-01-20sequencer: factor out code to append squash messagePhillip Wood-6/+12
2021-01-20rebase -i: only write fixup-message when it's neededPhillip Wood-4/+3
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
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-29 11:32:33 +0000