aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/rebase.c
AgeCommit message (Expand)AuthorFilesLines
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
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
2022-10-30Merge branch 'pw/rebase-reflog-fixes'Taylor Blau1-87/+59
2022-10-30Merge branch 'pw/rebase-keep-base-fixes'Taylor Blau1-61/+83
2022-10-17rebase: cleanup action handlingPhillip Wood1-49/+44
2022-10-17rebase --abort: improve reflog messagePhillip Wood1-20/+8
2022-10-17rebase --apply: make reflog messages match rebase --mergePhillip Wood1-4/+5
2022-10-17rebase --apply: respect GIT_REFLOG_ACTIONPhillip Wood1-3/+4
2022-10-17rebase --merge: fix reflog message after skippingPhillip Wood1-2/+0
2022-10-17rebase --merge: fix reflog when continuingPhillip Wood1-2/+0
2022-10-17rebase --apply: remove duplicated codePhillip Wood1-10/+1
2022-10-17rebase --keep-base: imply --no-fork-pointPhillip Wood1-0/+6
2022-10-17rebase --keep-base: imply --reapply-cherry-picksPhillip Wood1-1/+15
2022-10-17rebase: factor out branch_base calculationPhillip Wood1-13/+20
2022-10-17rebase: rename merge_base to branch_basePhillip Wood1-15/+15
2022-10-17rebase: store orig_head as a commitPhillip Wood1-35/+31
2022-10-17rebase: be stricter when reading state files containing oidsPhillip Wood1-4/+4
2022-07-19rebase: add rebase.updateRefs config optionDerrick Stolee1-0/+5
2022-07-19rebase: add --update-refs optionDerrick Stolee1-0/+5
2022-06-16builtin/rebase: remove a redundant space in l10n stringFangyi Zhou1-1/+1
2022-06-15Merge branch 'po/rebase-preserve-merges'Junio C Hamano1-5/+9
2022-06-06rebase: translate a die(preserve-merges) messagePhilip Oakley1-2/+2
2022-06-06rebase: note `preserve` merges may be a pull config optionPhilip Oakley1-1/+3
2022-06-06rebase: help users when dying with `preserve-merges`Philip Oakley1-2/+4
2022-06-06rebase.c: state preserve-merges has been removedPhilip Oakley1-2/+2
2022-05-11Merge branch 'ea/rebase-code-simplify'Junio C Hamano1-4/+2
2022-04-21rebase: use correct base for --keep-base when a branch is givenAlex Henrie1-27/+28
2022-04-20rebase: simplify an assignment of options.type in cmd_rebaseEdmundo Carmona Antoranz1-4/+2
2022-03-18rebase: set REF_HEAD_DETACH in checkout_up_to_date()John Cai1-0/+2
2022-02-25Merge branch 'ja/i18n-common-messages'Junio C Hamano1-1/+1
2022-02-18Merge branch 'pw/use-in-process-checkout-in-rebase'Junio C Hamano1-41/+60
2022-02-09Merge branch 'ab/config-based-hooks-2'Junio C Hamano1-1/+2
2022-02-04i18n: remove from i18n strings that do not hold translatable partsJean-Noël Avila1-1/+1
2022-01-26rebase --apply: set ORIG_HEAD correctlyPhillip Wood1-0/+1
2022-01-26rebase --apply: fix reflogPhillip Wood1-4/+4
2022-01-26reset_head(): take struct rebase_head_optsPhillip Wood1-21/+36
2022-01-26rebase: cleanup reset_head() callsPhillip Wood1-2/+2
2022-01-26create_autostash(): remove unneeded parameterPhillip Wood1-4/+4
2022-01-26reset_head(): make default_reflog_action optionalPhillip Wood1-6/+4
2022-01-26reset_head(): remove action parameterPhillip Wood1-7/+7
2022-01-26rebase: factor out checkout for up to date branchPhillip Wood1-14/+19
2022-01-07rebase: convert pre-rebase to use hook.hEmily Shaffer1-1/+2
2022-01-05i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila1-2/+2
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila1-3/+3
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano1-324/+14
2021-10-06Merge branch 'pw/rebase-of-a-tag-fix'Junio C Hamano1-28/+21
2021-09-22rebase: dereference tagsPhillip Wood1-6/+8
2021-09-22rebase: use lookup_commit_reference_by_name()Phillip Wood1-13/+4
2021-09-22rebase: use our standard error return valuePhillip Wood1-9/+9
2021-09-20Merge branch 'js/run-command-close-packs'Junio C Hamano1-1/+0
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano1-0/+6
2021-09-10Merge branch 'js/advise-when-skipping-cherry-picked'Junio C Hamano1-0/+1
2021-09-09sparse-index: integrate with cherry-pick and rebaseDerrick Stolee1-0/+6
2021-09-09run_auto_maintenance(): implicitly close the object storeJohannes Schindelin1-1/+0
2021-09-08Merge branch 'ab/rebase-fatal-fatal-fix'Junio C Hamano1-1/+1
2021-09-07rebase: stop mentioning the -p option in commentsJohannes Schindelin1-1/+1
2021-09-07rebase: remove obsolete code commentJohannes Schindelin1-1/+1
2021-09-07rebase: drop the internal `rebase--interactive` commandJohannes Schindelin1-192/+1
2021-09-07rebase: drop support for `--preserve-merges`Johannes Schindelin1-127/+11
2021-08-30sequencer: advise if skipping cherry-picked commitJosh Steadmon1-0/+1
2021-08-30Merge branch 'en/ort-becomes-the-default'Junio C Hamano1-1/+1
2021-08-24rebase: emit one "fatal" in "fatal: fatal: <error>"Ævar Arnfjörð Bjarmason1-1/+1
2021-08-05Change default merge backend from recursive to ortElijah Newren1-1/+1
2021-07-26builtin/rebase: fix options.strategy memory lifecycleAndrzej Hunt1-1/+2
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano1-2/+2
2021-05-07Merge branch 'ah/plugleaks'Junio C Hamano1-0/+1
2021-04-28builtin/rebase: release git_format_patch_opt tooAndrzej Hunt1-0/+1
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-2/+2
2021-04-16Merge branch 'en/ort-readiness'Junio C Hamano1-0/+1
2021-03-23rebase: remove transitory rebase.useBuiltin setting & envÆvar Arnfjörð Bjarmason1-11/+0
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren1-0/+1
2021-02-24rebase: add a config option for --no-fork-pointAlex Henrie1-7/+13
2021-01-15Merge branch 'rs/rebase-commit-validation'Junio C Hamano1-1/+3
2021-01-04rebase: verify commit parameterRené Scharfe1-1/+3
2020-11-18Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano1-1/+12
2020-11-18Merge branch 'pw/rebase-i-orig-head'Junio C Hamano1-10/+10
2020-11-04rebase -i: simplify get_revision_ranges()Phillip Wood1-6/+4
2020-11-04rebase -i: use struct object_id when writing statePhillip Wood1-2/+3
2020-11-04rebase -i: use struct object_id rather than looking up commitPhillip Wood1-2/+3
2020-11-04rebase -i: stop overwriting ORIG_HEAD bufferPhillip Wood1-5/+5
2020-11-02merge,rebase,revert: select ort or recursive by config or environmentElijah Newren1-1/+12
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn1-1/+1
2020-09-25Merge branch 'ds/maintenance-part-1'Junio C Hamano1-2/+2
2020-09-17maintenance: replace run_auto_gc()Derrick Stolee1-2/+2
2020-09-03Merge branch 'pw/rebase-i-more-options'Junio C Hamano1-11/+36
2020-08-19rebase: add --reset-author-dateRohit Ashiwal1-1/+3
2020-08-19rebase -i: support --ignore-datePhillip Wood1-5/+8
2020-08-17rebase -i: support --committer-date-is-author-datePhillip Wood1-5/+12
2020-07-30strvec: rename struct fieldsJeff King1-8/+8
2020-07-28strvec: fix indentation in renamed callsJeff King1-7/+7
2020-07-28strvec: convert builtin/ callers away from argv_array nameJeff King1-30/+30
2020-07-28strvec: rename files from argv-array to strvecJeff King1-1/+1
2020-07-13rebase -i: add --ignore-whitespace flagRohit Ashiwal1-3/+16
2020-05-13Merge branch 'jc/auto-gc-quiet'Junio C Hamano1-2/+1
2020-05-07auto-gc: pass --quiet down from am, commit, merge and rebaseJunio C Hamano1-2/+1
2020-05-05Merge branch 'dl/opt-callback-cleanup'Junio C Hamano1-10/+10
2020-05-01Merge branch 'en/rebase-root-and-fork-point-are-incompatible'Junio C Hamano1-0/+3
2020-04-29Merge branch 'dl/merge-autostash-rebase-quit-fix'Junio C Hamano1-0/+1
2020-04-29Merge branch 'dl/merge-autostash'Junio C Hamano1-264/+44
2020-04-28rebase: save autostash entry into stash reflog on --quitDenton Liu1-0/+1
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu1-10/+10
2020-04-27rebase: display an error if --root and --fork-point are both providedElijah Newren1-0/+3
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Junio C Hamano1-0/+7
2020-04-22Merge branch 'en/rebase-no-keep-empty'Junio C Hamano1-7/+10
2020-04-22Merge branch 'dd/no-gpg-sign'Junio C Hamano1-3/+4
2020-04-11rebase --merge: optionally skip upstreamed commitsJonathan Tan1-0/+7
2020-04-11rebase: fix an incompatible-options error messageElijah Newren1-1/+1
2020-04-11rebase: reinstate --no-keep-emptyElijah Newren1-6/+9
2020-04-10merge: teach --autostash optionDenton Liu1-2/+1
2020-04-10sequencer: extract perform_autostash() from rebaseDenton Liu1-49/+0
2020-04-10rebase: generify create_autostash()Denton Liu1-16/+16
2020-04-10rebase: extract create_autostash()Denton Liu1-44/+50
2020-04-10reset: extract reset_head() from rebaseDenton Liu1-138/+1
2020-04-10rebase: generify reset_head()Denton Liu1-27/+37
2020-04-10rebase: use apply_autostash() from sequencer.cDenton Liu1-47/+2
2020-04-10rebase: use read_oneliner()Denton Liu1-20/+17
2020-04-03rebase.c: honour --no-gpg-signĐoàn Trần Công Danh1-3/+4
2020-03-26Merge branch 'bc/filter-process'Junio C Hamano1-0/+1
2020-03-16builtin/rebase: compute checkout metadata for rebasesbrian m. carlson1-0/+1
2020-03-12Merge branch 'en/rebase-backend'Junio C Hamano1-1/+1
2020-03-11i18n: unmark a message in rebase.cJiang Xin1-1/+1
2020-03-05Merge branch 'ag/rebase-remove-redundant-code'Junio C Hamano1-9/+1
2020-03-05Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'Junio C Hamano1-2/+3
2020-03-02Merge branch 'en/rebase-backend'Junio C Hamano1-78/+179
2020-02-26builtin/rebase: remove a call to get_oid() on `options.switch_to'Alban Gruin1-9/+1
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-16 10:19:49 +0000