summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)Author
10 hoursMerge branch 'ps/the-index-is-no-more' into seenJunio C Hamano
12 daysbuiltin: stop using `the_index`Patrick Steinhardt
2024-04-08rebase -i: pass struct replay_opts to parse_insn_line()Phillip Wood
2024-04-05Merge branch 'jk/core-comment-string'Junio C Hamano
2024-04-03Merge branch 'bl/cherry-pick-empty'Junio C Hamano
2024-04-01Merge branch 'jk/rebase-apply-leakfix'Junio C Hamano
2024-03-25rebase: update `--empty=ask` to `--empty=stop`Brian Lyles
2024-03-22rebase: use child_process_clear() to cleanJeff King
2024-03-18Merge branch 'pw/rebase-i-ignore-cherry-pick-help-environment'Junio C Hamano
2024-03-12strbuf: accept a comment string for strbuf_stripspace()Jeff King
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano
2024-03-01Merge branch 'hs/rebase-not-in-progress' into HEADJunio C Hamano
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin
2024-02-27rebase -i: stop setting GIT_CHERRY_PICK_HELPPhillip Wood
2024-02-21rebase: make warning less passive aggressiveHarmen Stoppels
2024-01-19refs: convert AUTO_MERGE to become a normal pseudo-refPatrick Steinhardt
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano
2024-01-02Merge branch 'rs/rebase-use-strvec-pushf'Junio C Hamano
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren
2023-12-20rebase: use strvec_pushf() for format-patch revisionsRené Scharfe
2023-11-16rebase: support --autosquash without -iAndy Koppe
2023-11-16rebase: fully ignore rebase.autoSquash without -iAndy Koppe
2023-11-07Merge branch 'rs/fix-arghelp'Junio C Hamano
2023-10-29am, rebase: fix arghelp syntax of --emptyRené Scharfe
2023-10-20rebase: move parse_opt_keep_empty() downOswald Buddenhagen
2023-10-20rebase: handle --strategy via imply_merge() as wellOswald Buddenhagen
2023-10-20rebase: simplify code related to imply_merge()Oswald Buddenhagen
2023-09-29diff --stat: set the width defaults in a helper functionDragan Simic
2023-09-18diff --stat: add config option to limit filename widthDragan Simic
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano
2023-07-06Merge branch 'gc/config-context'Junio C Hamano
2023-07-06Merge branch 'cw/strbuf-cleanup'Junio C Hamano
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan
2023-06-28config: add ctx arg to config_fn_tGlen Choo
2023-06-21repository: remove unnecessary include of path.hElijah Newren
2023-06-12strbuf: remove global variableCalvin Wan
2023-04-25Merge branch 'en/header-split-cache-h'Junio C Hamano
2023-04-18Merge branch 'pw/rebase-cleanup-merge-strategy-option-handling'Junio C Hamano
2023-04-11object-file.h: move declarations for object-file.c functions from cache.hElijah Newren
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren
2023-04-11treewide: be explicit about dependence on trace.h & trace2.hElijah Newren
2023-04-10rebase -m: cleanup --strategy-option handlingPhillip Wood
2023-04-10rebase: stop reading and writing unnecessary strategy statePhillip Wood
2023-04-06Merge branch 'en/header-split-cleanup'Junio C Hamano
2023-04-06Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano
2023-04-04Merge branch 'ah/rebase-merges-config'Junio C Hamano
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano
2023-03-28cocci: apply the "diff.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-28cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
generated by cgit v0.10.2-6-g49f6 at 2024-05-01 07:10:19 (GMT)