aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/rebase.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano1-1/+0
2023-07-06Merge branch 'gc/config-context'Junio C Hamano1-2/+3
2023-07-06Merge branch 'cw/strbuf-cleanup'Junio C Hamano1-1/+1
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
2023-06-28config: add ctx arg to config_fn_tGlen Choo1-2/+3
2023-06-21repository: remove unnecessary include of path.hElijah Newren1-0/+1
2023-06-12strbuf: remove global variableCalvin Wan1-1/+1
2023-04-25Merge branch 'en/header-split-cache-h'Junio C Hamano1-0/+3
2023-04-17Merge branch 'pw/rebase-cleanup-merge-strategy-option-handling'Junio C Hamano1-44/+10
2023-04-11object-file.h: move declarations for object-file.c functions from cache.hElijah Newren1-0/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on trace.h & trace2.hElijah Newren1-0/+1
2023-04-10rebase -m: cleanup --strategy-option handlingPhillip Wood1-20/+10
2023-04-10rebase: stop reading and writing unnecessary strategy statePhillip Wood1-24/+0
2023-04-06Merge branch 'en/header-split-cleanup'Junio C Hamano1-0/+4
2023-04-06Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano1-9/+12
2023-04-04Merge branch 'ah/rebase-merges-config'Junio C Hamano1-15/+55
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-9/+12
2023-03-28cocci: apply the "diff.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-28cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-2/+3
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-5/+7
2023-03-27rebase: add a config option for --rebase-mergesAlex Henrie1-19/+55
2023-03-27rebase: deprecate --rebase-merges=""Alex Henrie1-2/+6
2023-03-21Merge branch 'jk/format-patch-ignore-noprefix'Junio C Hamano1-1/+1
2023-03-21environment.h: move declarations for environment.c functions from cache.hElijah Newren1-0/+1
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren1-0/+1
2023-03-21abspath.h: move absolute path functions from cache.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-03-17Merge branch 'fz/rebase-msg-update'Junio C Hamano1-1/+1
2023-03-13rebase: prefer --default-prefix to --{src,dst}-prefix for format-patchJeff King1-1/+1
2023-02-27rebase: fix capitalisation autoSquash in i18n stringFangyi Zhou1-1/+1
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2023-02-06builtin/rebase.c: free() "options.strategy_opts"Ævar Arnfjörð Bjarmason1-0/+1
2023-02-06builtin/rebase.c: fix "options.onto_name" leakÆvar Arnfjörð Bjarmason1-1/+3
2023-02-06sequencer API users: fix get_replay_opts() leaksÆvar Arnfjörð Bjarmason1-0/+4
2023-02-06rebase: use "cleanup" pattern in do_interactive_rebase()Ævar Arnfjörð Bjarmason1-8/+5
2023-01-25rebase: provide better error message for apply options vs. merge configElijah Newren1-6/+21
2023-01-25rebase: put rebase_options initialization in single placeElijah Newren1-2/+2
2023-01-25rebase: add coverage of other incompatible optionsElijah Newren1-0/+3
2023-01-25rebase: fix incompatiblity checks for --[no-]reapply-cherry-picksElijah Newren1-13/+21
2023-01-25rebase: flag --apply and --merge as incompatibleElijah Newren1-2/+10
2023-01-25rebase: mark --update-refs as requiring the merge backendElijah Newren1-0/+3
2023-01-13rebase: cleanup "--exec" option handlingPhillip Wood1-34/+11
2022-12-14Merge branch 'ab/various-leak-fixes'Junio C Hamano1-0/+4
2022-11-28Merge branch 'ab/fewer-the-index-macros'Junio C Hamano1-3/+3
2022-11-21rebase: don't leak on "--abort"Ævar Arnfjörð Bjarmason1-0/+1
2022-11-21built-ins & libs & helpers: add/move destructors, fix leaksÆvar Arnfjörð Bjarmason1-0/+3
2022-11-21cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason1-3/+3
2022-11-09rebase: stop exporting GIT_REFLOG_ACTIONPhillip Wood1-12/+15