summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/rebase-count-fixes' into seenJunio C Hamano2023-05-171-5/+8
|\
| * rebase -r: fix the total number shown in the progressJohannes Schindelin2023-05-141-3/+6
| * rebase --update-refs: fix loopsJohannes Schindelin2023-05-141-2/+2
| * rebase --update-refs: avoid unintended ref deletionVictoria Dye2022-12-091-3/+6
| * Merge branch 'jk/sequencer-missing-author-name-check' into maint-2.38Junio C Hamano2022-10-251-1/+1
| |\
| * \ Merge branch 'ja/rebase-i-avoid-amending-self' into maint-2.38Junio C Hamano2022-10-251-2/+2
| |\ \
* | \ \ Merge branch 'ob/revert-of-revert' into seenJunio C Hamano2023-05-171-0/+14
|\ \ \ \
| * | | | sequencer: beautify subject of reverts of revertsOswald Buddenhagen2023-05-051-0/+14
* | | | | Merge branch 'en/header-split-cache-h-part-3' into jchJunio C Hamano2023-05-171-2/+5
|\ \ \ \ \
| * | | | | object-store-ll.h: split this header out of object-store.hElijah Newren2023-05-161-1/+1
| * | | | | repository: remove unnecessary include of path.hElijah Newren2023-05-161-0/+1
| * | | | | cache.h: remove this no-longer-used headerElijah Newren2023-05-161-1/+1
| * | | | | merge.h: move declarations for merge.c from cache.hElijah Newren2023-05-161-0/+1
| * | | | | sparse-index.h: move declarations for sparse-index.c from cache.hElijah Newren2023-05-161-0/+1
| * | | | | Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-pa...Junio C Hamano2023-05-081-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | Merge branch 'pw/rebase-i-after-failure' into jchJunio C Hamano2023-05-171-80/+90
|\ \ \ \ \ \
| * | | | | | rebase -i: fix adding failed command to the todo listPhillip Wood2023-04-211-6/+6
| * | | | | | rebase: fix rewritten list for failed pickPhillip Wood2023-04-211-12/+7
| * | | | | | rebase --continue: refuse to commit after failed commandPhillip Wood2023-04-211-5/+5
| * | | | | | sequencer: factor out part of pick_commits()Phillip Wood2023-04-211-60/+69
| * | | | | | rebase -i: remove patch file after conflict resolutionPhillip Wood2023-04-211-2/+7
| * | | | | | rebase -i: move unlink() callsPhillip Wood2023-04-211-3/+4
* | | | | | | Merge branch 'cw/strbuf-cleanup' into jchJunio C Hamano2023-05-171-9/+15
|\ \ \ \ \ \ \
| * | | | | | | strbuf: remove global variableCalvin Wan2023-05-121-9/+15
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ob/messages-capitalize-exception'Junio C Hamano2023-05-091-2/+2
|\ \ \ \ \ \ \
| * | | | | | | messages: capitalization and punctuation exceptionsOswald Buddenhagen2023-04-281-2/+2
* | | | | | | | Merge branch 'ob/sequencer-i18n-fix'Junio C Hamano2023-05-091-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | sequencer: actually translate report in do_exec()Oswald Buddenhagen2023-04-281-1/+1
* | | | | | | | Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano2023-05-091-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | copy.h: move declarations for copy.c functions from cache.hElijah Newren2023-04-241-0/+1
* | | | | | | Merge branch 'en/header-split-cache-h'Junio C Hamano2023-04-251-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | pager.h: move declarations for pager.c functions from cache.hElijah Newren2023-04-111-0/+1
| * | | | | object-file.h: move declarations for object-file.c functions from cache.hElijah Newren2023-04-111-0/+1
| * | | | | object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
| * | | | | treewide: be explicit about dependence on advice.hElijah Newren2023-04-111-0/+1
| * | | | | Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-65/+85
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'pw/rebase-cleanup-merge-strategy-option-handling'Junio C Hamano2023-04-171-32/+26
|\ \ \ \ \ \ \
| * | | | | | | rebase -m: fix serialization of strategy optionsPhillip Wood2023-04-101-5/+6
| * | | | | | | rebase -m: cleanup --strategy-option handlingPhillip Wood2023-04-101-1/+1
| * | | | | | | sequencer: use struct strvec to store merge strategy optionsPhillip Wood2023-04-101-27/+21
| * | | | | | | rebase: stop reading and writing unnecessary strategy statePhillip Wood2023-04-101-1/+0
* | | | | | | | Merge branch 'en/header-split-cleanup'Junio C Hamano2023-04-061-0/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren2023-03-211-0/+1
| * | | | | | | abspath.h: move absolute path functions from cache.hElijah Newren2023-03-211-0/+1
| * | | | | | | environment: move comment_line_char from cache.hElijah Newren2023-03-211-0/+1
| * | | | | | | treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
| |/ / / / / /
* | | | | | | Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano2023-04-061-65/+85
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | libs: use "struct repository *" argument, not "the_repository"Ævar Arnfjörð Bjarmason2023-03-281-54/+48
| * | | | | | post-cocci: adjust comments for recent repo_* migrationÆvar Arnfjörð Bjarmason2023-03-281-3/+3
| * | | | | | cocci: apply the "pretty.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-4/+8