summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ | |/|
* | | Merge branch 'pw/rebase-i-more-options'Junio C Hamano2020-09-031-4/+126
|\ \ \ | | |/ | |/|
| * | rebase -i: support --ignore-datePhillip Wood2020-08-191-12/+54
| * | rebase -i: support --committer-date-is-author-datePhillip Wood2020-08-171-3/+83
| * | am: stop exporting GIT_COMMITTER_DATEPhillip Wood2020-08-171-2/+2
* | | Merge branch 'hn/refs-pseudorefs'Junio C Hamano2020-08-311-22/+34
|\ \ \
| * | | sequencer: treat REVERT_HEAD as a pseudo refHan-Wen Nienhuys2020-08-211-7/+9
| * | | sequencer: treat CHERRY_PICK_HEAD as a pseudo refHan-Wen Nienhuys2020-08-211-16/+26
* | | | Merge branch 'ak/sequencer-fix-find-uniq-abbrev'Junio C Hamano2020-08-191-2/+3
|\ \ \ \
| * | | | rebase -i: fix possibly wrong onto hash in todoAntti Keränen2020-08-131-2/+3
| | |_|/ | |/| |
* | | | Merge branch 'en/sequencer-merge-labels'Junio C Hamano2020-08-191-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | sequencer: avoid garbled merge machinery messages due to commit labelsElijah Newren2020-08-141-1/+1
| |/ /
* | | strvec: rename struct fieldsJeff King2020-07-301-2/+2
* | | strvec: fix indentation in renamed callsJeff King2020-07-281-4/+4
* | | strvec: convert remaining callers away from argv_array nameJeff King2020-07-281-56/+56
* | | strvec: rename files from argv-array to strvecJeff King2020-07-281-1/+1
|/ /
* | Merge branch 'js/rebase-autosquash-double-fixup-fix'Junio C Hamano2020-05-141-2/+5
|\ \
| * | rebase --autosquash: fix a potential segfaultJohannes Schindelin2020-05-091-2/+5
* | | Merge branch 'dl/merge-autostash'Junio C Hamano2020-04-291-47/+129
|\ \ \
| * | | sequencer: implement apply_autostash_oid()Denton Liu2020-04-101-12/+26
| * | | sequencer: implement save_autostash()Denton Liu2020-04-101-10/+27
| * | | sequencer: unlink autostash in apply_autostash()Denton Liu2020-04-101-0/+1
| * | | sequencer: extract perform_autostash() from rebaseDenton Liu2020-04-101-0/+50
| * | | rebase: use apply_autostash() from sequencer.cDenton Liu2020-04-101-1/+1
| * | | sequencer: rename stash_sha1 to stash_oidDenton Liu2020-04-101-8/+8
View Lorry Controller Status