summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren2021-09-271-0/+2
* Merge branch 'ab/retire-advice-config'Junio C Hamano2021-09-101-4/+4
|\
| * advice: remove read uses of most global `advice_` variablesBen Boeckel2021-08-251-4/+4
* | Merge branch 'zh/cherry-pick-advice'Junio C Hamano2021-09-101-4/+16
|\ \
| * | cherry-pick: use better advice messageZheNing Hu2021-08-231-4/+16
| |/
* | Merge branch 'js/advise-when-skipping-cherry-picked'Junio C Hamano2021-09-101-2/+20
|\ \
| * | sequencer: advise if skipping cherry-picked commitJosh Steadmon2021-08-301-2/+20
| |/
* | Merge branch 'pw/rebase-r-fixes'Junio C Hamano2021-09-031-49/+57
|\ \
| * | rebase -r: fix merge -c with a merge strategyPhillip Wood2021-08-231-1/+4
| * | rebase -r: don't write .git/MERGE_MSG when fast-forwardingPhillip Wood2021-08-231-40/+41
| * | rebase -r: make 'merge -c' behave like rewordPhillip Wood2021-08-201-10/+14
| |/
* | Merge branch 'pw/rebase-skip-final-fix'Junio C Hamano2021-09-031-0/+3
|\ \
| * | rebase --continue: remove .git/MERGE_MSGPhillip Wood2021-08-131-0/+3
* | | Merge branch 'en/ort-becomes-the-default'Junio C Hamano2021-08-301-2/+2
|\ \ \
| * | | Change default merge backend from recursive to ortElijah Newren2021-08-051-2/+2
* | | | Merge branch 'en/merge-strategy-docs'Junio C Hamano2021-08-301-1/+1
|\ \ \ \ | |/ / /
| * | | Update error message and code commentElijah Newren2021-08-051-1/+1
| | |/ | |/|
* | | Merge branch 'js/expand-runtime-prefix'Junio C Hamano2021-08-241-1/+1
|\ \ \ | |/ / |/| |
| * | Use a better name for the function interpolating pathsJohannes Schindelin2021-07-261-1/+1
| |/
* | *.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
| |/
View Lorry Controller Status