aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/rebase.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+3
2024-09-23Merge branch 'jc/pass-repo-to-builtins'Junio C Hamano1-2/+6
2024-09-20Merge branch 'pw/rebase-autostash-fix'Junio C Hamano1-7/+32
2024-09-13builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai1-1/+2
2024-09-13builtin: add a repository parameter for builtin functionsJohn Cai1-1/+4
2024-09-03rebase: apply and cleanup autostash when rebase fails to startPhillip Wood1-7/+32
2024-08-23Merge branch 'ps/config-wo-the-repository'Junio C Hamano1-1/+1
2024-08-14builtin/rebase: fix leaking `commit.gpgsign` valuePatrick Steinhardt1-0/+1
2024-08-13hooks: remove implicit dependency on `the_repository`Patrick Steinhardt1-1/+1
2024-06-20Merge branch 'pw/rebase-i-error-message'Junio C Hamano1-6/+11
2024-06-07builtin/rebase: always store allocated string in `options.strategy`Patrick Steinhardt1-7/+7
2024-06-07builtin/rebase: do not assign default backend to non-constant fieldPatrick Steinhardt1-9/+16
2024-05-30rebase -i: pass struct replay_opts to parse_insn_line()Phillip Wood1-6/+11
2024-05-27config: clarify memory ownership in `git_config_string()`Patrick Steinhardt1-1/+1
2024-05-16Merge branch 'ps/refs-without-the-repository'Junio C Hamano1-8/+10
2024-05-07cocci: apply rules to rewrite callers of "refs" interfacesPatrick Steinhardt1-8/+10
2024-04-18builtin: stop using `the_index`Patrick Steinhardt1-2/+1
2024-04-05Merge branch 'jk/core-comment-string'Junio C Hamano1-1/+1
2024-04-03Merge branch 'bl/cherry-pick-empty'Junio C Hamano1-6/+10
2024-04-01Merge branch 'jk/rebase-apply-leakfix'Junio C Hamano1-3/+3
2024-03-25rebase: update `--empty=ask` to `--empty=stop`Brian Lyles1-6/+10
2024-03-22rebase: use child_process_clear() to cleanJeff King1-3/+3
2024-03-18Merge branch 'pw/rebase-i-ignore-cherry-pick-help-environment'Junio C Hamano1-11/+3
2024-03-12strbuf: accept a comment string for strbuf_stripspace()Jeff King1-1/+1
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano1-3/+5
2024-03-01Merge branch 'hs/rebase-not-in-progress' into HEADJunio C Hamano1-1/+1
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-3/+5
2024-02-27rebase -i: stop setting GIT_CHERRY_PICK_HELPPhillip Wood1-11/+3
2024-02-21rebase: make warning less passive aggressiveHarmen Stoppels1-1/+1
2024-01-19refs: convert AUTO_MERGE to become a normal pseudo-refPatrick Steinhardt1-1/+1
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano1-4/+0
2024-01-02Merge branch 'rs/rebase-use-strvec-pushf'Junio C Hamano1-11/+6
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-4/+0
2023-12-20rebase: use strvec_pushf() for format-patch revisionsRené Scharfe1-11/+6
2023-11-16rebase: support --autosquash without -iAndy Koppe1-3/+1
2023-11-16rebase: fully ignore rebase.autoSquash without -iAndy Koppe1-7/+6
2023-11-07Merge branch 'rs/fix-arghelp'Junio C Hamano1-1/+1
2023-10-29am, rebase: fix arghelp syntax of --emptyRené Scharfe1-1/+1
2023-10-20rebase: move parse_opt_keep_empty() downOswald Buddenhagen1-13/+12
2023-10-20rebase: handle --strategy via imply_merge() as wellOswald Buddenhagen1-12/+1
2023-10-20rebase: simplify code related to imply_merge()Oswald Buddenhagen1-5/+1
2023-09-29diff --stat: set the width defaults in a helper functionDragan Simic1-3/+1
2023-09-18diff --stat: add config option to limit filename widthDragan Simic1-0/+1
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