summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/header-split-cache-h-part-3' into jchJunio C Hamano2023-05-171-0/+1
|\
| * repository: remove unnecessary include of path.hElijah Newren2023-05-161-0/+1
* | strbuf: remove global variableCalvin Wan2023-05-121-1/+1
|/
* Merge branch 'en/header-split-cache-h'Junio C Hamano2023-04-251-0/+3
|\
| * 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 trace.h & trace2.hElijah Newren2023-04-111-0/+1
| * Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-9/+12
| |\
* | \ Merge branch 'pw/rebase-cleanup-merge-strategy-option-handling'Junio C Hamano2023-04-171-44/+10
|\ \ \
| * | | rebase -m: cleanup --strategy-option handlingPhillip Wood2023-04-101-20/+10
| * | | rebase: stop reading and writing unnecessary strategy statePhillip Wood2023-04-101-24/+0
* | | | Merge branch 'en/header-split-cleanup'Junio C Hamano2023-04-061-0/+4
|\ \ \ \ | | |/ / | |/| |
| * | | environment.h: move declarations for environment.c functions from cache.hElijah Newren2023-03-211-0/+1
| * | | 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
| * | | 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-9/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | cocci: apply the "diff.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * | | cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * | | cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-2/+3
| * | | cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-5/+7
* | | | Merge branch 'ah/rebase-merges-config'Junio C Hamano2023-04-041-15/+55
|\ \ \ \ | |_|_|/ |/| | |
| * | | rebase: add a config option for --rebase-mergesAlex Henrie2023-03-271-19/+55
| * | | rebase: deprecate --rebase-merges=""Alex Henrie2023-03-271-2/+6
| | |/ | |/|
* | | Merge branch 'jk/format-patch-ignore-noprefix'Junio C Hamano2023-03-211-1/+1
|\ \ \ | |/ / |/| |
| * | rebase: prefer --default-prefix to --{src,dst}-prefix for format-patchJeff King2023-03-131-1/+1
| |/
* | Merge branch 'fz/rebase-msg-update'Junio C Hamano2023-03-171-1/+1
|\ \
| * | rebase: fix capitalisation autoSquash in i18n stringFangyi Zhou2023-02-271-1/+1
| |/
* | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-231-0/+1
|/
* builtin/rebase.c: free() "options.strategy_opts"Ævar Arnfjörð Bjarmason2023-02-061-0/+1
* builtin/rebase.c: fix "options.onto_name" leakÆvar Arnfjörð Bjarmason2023-02-061-1/+3
* sequencer API users: fix get_replay_opts() leaksÆvar Arnfjörð Bjarmason2023-02-061-0/+4
* rebase: use "cleanup" pattern in do_interactive_rebase()Ævar Arnfjörð Bjarmason2023-02-061-8/+5
* rebase: provide better error message for apply options vs. merge configElijah Newren2023-01-251-6/+21
* rebase: put rebase_options initialization in single placeElijah Newren2023-01-251-2/+2
* rebase: add coverage of other incompatible optionsElijah Newren2023-01-251-0/+3
* rebase: fix incompatiblity checks for --[no-]reapply-cherry-picksElijah Newren2023-01-251-13/+21
* rebase: flag --apply and --merge as incompatibleElijah Newren2023-01-251-2/+10
* rebase: mark --update-refs as requiring the merge backendElijah Newren2023-01-251-0/+3
* rebase: cleanup "--exec" option handlingPhillip Wood2023-01-131-34/+11
* Merge branch 'ab/various-leak-fixes'Junio C Hamano2022-12-141-0/+4
|\
| * rebase: don't leak on "--abort"Ævar Arnfjörð Bjarmason2022-11-211-0/+1
| * built-ins & libs & helpers: add/move destructors, fix leaksÆvar Arnfjörð Bjarmason2022-11-211-0/+3
* | Merge branch 'ab/fewer-the-index-macros'Junio C Hamano2022-11-281-3/+3
|\ \ | |/ |/|
| * cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason2022-11-211-3/+3
* | rebase: stop exporting GIT_REFLOG_ACTIONPhillip Wood2022-11-091-12/+15
|/
* Merge branch 'pw/rebase-reflog-fixes'Taylor Blau2022-10-301-87/+59
|\
| * rebase: cleanup action handlingPhillip Wood2022-10-171-49/+44
| * rebase --abort: improve reflog messagePhillip Wood2022-10-171-20/+8
| * rebase --apply: make reflog messages match rebase --mergePhillip Wood2022-10-171-4/+5
View Lorry Controller Status