summaryrefslogtreecommitdiffstats
path: root/sequencer.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* *.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason2021-07-131-0/+2
* sequencer.c: move static function to avoid forward declÆvar Arnfjörð Bjarmason2021-07-121-22/+19
* Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano2021-05-101-2/+2
|\
| * hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-2/+2
* | Merge branch 'ab/rebase-no-reschedule-failed-exec'Junio C Hamano2021-05-071-0/+5
|\ \
| * | rebase: don't override --no-reschedule-failed-exec with configÆvar Arnfjörð Bjarmason2021-04-101-0/+5
* | | Merge branch 'en/ort-readiness'Junio C Hamano2021-04-161-0/+5
|\ \ \ | |_|/ |/| |
| * | merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren2021-03-201-0/+5
* | | Merge branch 'en/sequencer-edit-upon-conflict-fix'Junio C Hamano2021-04-081-11/+41
|\ \ \
| * | | sequencer: fix edit handling for cherry-pick and revert messagesElijah Newren2021-03-311-11/+41
| | |/ | |/|
* | | Merge branch 'cm/rebase-i-fixup-amend-reword'Junio C Hamano2021-03-261-15/+1
|\ \ \
| * | | sequencer: export and rename subject_length()Charvi Mendiratta2021-03-151-15/+1
* | | | Merge branch 'cm/rebase-i-updates'Junio C Hamano2021-03-261-12/+11
|\| | |
| * | | sequencer: rename a few functionsCharvi Mendiratta2021-02-081-9/+9
| * | | sequencer: fixup the datatype of the 'flag' argumentCharvi Mendiratta2021-02-081-4/+3
* | | | Merge branch 'cm/rebase-i'Junio C Hamano2021-03-261-39/+256
|\| | | | |/ / |/| |
| * | rebase -i: teach --autosquash to work with amend!Charvi Mendiratta2021-01-291-7/+16
| * | rebase -i: add fixup [-C | -c] commandCharvi Mendiratta2021-01-291-19/+194
| * | sequencer: use const variable for commit message commentsCharvi Mendiratta2021-01-291-5/+10
| * | sequencer: pass todo_item to do_pick_commit()Charvi Mendiratta2021-01-291-7/+11
| * | rebase -i: comment out squash!/fixup! subjects from squash messagePhillip Wood2021-01-291-1/+20
| * | sequencer: factor out code to append squash messagePhillip Wood2021-01-201-6/+12
| * | rebase -i: only write fixup-message when it's neededPhillip Wood2021-01-201-4/+3
* | | use CALLOC_ARRAYRené Scharfe2021-03-131-1/+1
| |/ |/|
* | Merge branch 'ds/more-index-cleanups'Junio C Hamano2021-02-101-3/+0
|\ \
| * | cache-tree: clean up cache_tree_update()Derrick Stolee2021-01-231-3/+0
| |/
* / rebase -i: do leave commit message intact in fixup! chainsJohannes Schindelin2021-01-281-1/+12
|/
* Merge branch 'en/strmap'Junio C Hamano2020-11-211-2/+2
|\
| * hashmap: provide deallocation function namesElijah Newren2020-11-021-2/+2
* | Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano2020-11-181-11/+61
|\ \
| * | merge,rebase,revert: select ort or recursive by config or environmentElijah Newren2020-11-021-11/+61
| |/
* | Merge branch 'pw/rebase-i-orig-head'Junio C Hamano2020-11-181-9/+6
|\ \
| * | rebase -i: use struct object_id when writing statePhillip Wood2020-11-041-2/+3
| * | rebase -i: use struct object_id rather than looking up commitPhillip Wood2020-11-041-7/+3
| |/
* | Merge branch 'jc/sequencer-stopped-sha-simplify'Junio C Hamano2020-11-111-1/+1
|\ \
| * | sequencer: tolerate abbreviated stopped-sha fileJonathan Tan2020-10-211-1/+1
* | | Merge branch 'jk/committer-date-is-author-date-fix-simplify'Junio C Hamano2020-11-091-26/+2
|\ \ \
| * | | am, sequencer: stop parsing our own committer identJeff King2020-10-261-26/+2
* | | | Merge branch 'en/sequencer-rollback-lock-cleanup'Junio C Hamano2020-11-021-1/+0
|\ \ \ \
| * | | | sequencer: remove duplicate rollback_lock_file() callElijah Newren2020-10-211-1/+0
* | | | | Merge branch 'sc/sequencer-gpg-octopus'Junio C Hamano2020-11-021-1/+3
|\ \ \ \ \
| * | | | | sequencer: pass explicit --no-gpg-sign to mergeSamuel Čavoj2020-10-181-0/+2
| * | | | | sequencer: fix gpg option passed to merge subcommandSamuel Čavoj2020-10-181-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/committer-date-is-author-date-fix'Junio C Hamano2020-10-261-1/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | rebase: fix broken email with --committer-date-is-author-dateJeff King2020-10-231-1/+1
* | | | Merge branch 'jk/unused'Junio C Hamano2020-10-051-6/+14
|\ \ \ \
| * | | | sequencer: handle ignore_footer when parsing trailersJeff King2020-09-301-0/+9
| * | | | sequencer: drop repository argument from run_git_commit()Jeff King2020-09-301-6/+5
* | | | | Merge branch 'jc/sequencer-stopped-sha-simplify'Junio C Hamano2020-10-041-5/+6
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | sequencer: stop abbreviating stopped-sha fileJunio C Hamano2020-09-251-5/+6
| | |/ | |/|