aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/rebase.c
AgeCommit message (Expand)AuthorFilesLines
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-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
2020-02-24rebase: refuse to switch to branch already checked out elsewhereEric Sunshine1-2/+3
2020-02-16rebase: rename the two primary rebase backendsElijah Newren1-52/+47
2020-02-16rebase: change the default backend from "am" to "merge"Elijah Newren1-2/+2
2020-02-16rebase: make the backend configurable via config settingElijah Newren1-7/+24
2020-02-16rebase: drop '-i' from the reflog for interactive-based rebasesElijah Newren1-1/+1
2020-02-16rebase: add an --am optionElijah Newren1-1/+17
2020-02-16rebase: move incompatibility checks between backend options a bit earlierElijah Newren1-11/+11
2020-02-16rebase: allow more types of rebases to fast-forwardElijah Newren1-4/+14
2020-02-16rebase: fix handling of restrict_revisionElijah Newren1-2/+2
2020-02-16rebase: make sure to pass along the quiet flag to the sequencerElijah Newren1-1/+2
2020-02-16rebase, sequencer: remove the broken GIT_QUIET handlingElijah Newren1-4/+2
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyElijah Newren1-0/+52
2020-02-16rebase (interactive-backend): make --keep-empty the defaultElijah Newren1-9/+19
2020-02-14Merge branch 'ag/rebase-avoid-unneeded-checkout'Junio C Hamano1-13/+5
2020-01-24rebase -i: stop checking out the tip of the branch to rebaseAlban Gruin1-13/+5
2020-01-17git-rebase.txt: update description of --allow-empty-messageElijah Newren1-5/+7
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano1-37/+12
2020-01-02Merge branch 'en/rebase-signoff-fix'Junio C Hamano1-1/+1
2019-12-20rebase: fix saving of --signoff state for am-based rebasesElijah Newren1-1/+1
2019-12-16Merge branch 'dl/rebase-with-autobase'Junio C Hamano1-1/+2
2019-12-16Merge branch 'ag/sequencer-todo-updates'Junio C Hamano1-0/+6
2019-12-10Merge branch 'ra/rebase-i-more-options'Junio C Hamano1-12/+36
2019-12-05rebase: fix format.useAutoBase breakageDenton Liu1-1/+2
2019-11-25rebase -i: finishing touches to --reset-author-dateJunio C Hamano1-3/+3
2019-11-25rebase: fill `squash_onto' in get_replay_opts()Alban Gruin1-0/+5
2019-11-10Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano1-3/+4
2019-11-02rebase: add --reset-author-dateRohit Ashiwal1-0/+2
2019-11-02rebase -i: support --ignore-dateRohit Ashiwal1-5/+9
2019-11-02rebase -i: support --committer-date-is-author-dateRohit Ashiwal1-5/+12
2019-11-02rebase -i: add --ignore-whitespace flagRohit Ashiwal1-4/+15
2019-10-21rebase: hide --preserve-merges optionDenton Liu1-3/+4
2019-09-30Merge branch 'bw/rebase-autostash-keep-current-branch'Junio C Hamano1-12/+1
2019-09-30Merge branch 'dl/rebase-i-keep-base'Junio C Hamano1-22/+62
2019-09-18Merge branch 'js/rebase-r-strategy'Junio C Hamano1-11/+5
2019-09-07builtin/rebase.c: Remove pointless messageBen Wijen1-15/+1
2019-09-07builtin/rebase.c: make sure the active branch isn't moved when autostashingBen Wijen1-3/+6
2019-08-27rebase: teach rebase --keep-baseDenton Liu1-6/+26
2019-08-27rebase: fast-forward --fork-point in more casesDenton Liu1-3/+7
2019-08-27rebase: fast-forward --onto in more casesDenton Liu1-8/+19
2019-08-27rebase: refactor can_fast_forward into goto towerDenton Liu1-8/+13
2019-07-31rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`Johannes Schindelin1-2/+5
2019-07-31rebase -r: support merge strategies other than `recursive`Johannes Schindelin1-9/+0
2019-07-31rebase: fold git-rebase--common into the -p backendJohannes Schindelin1-2/+1
2019-07-31Drop unused git-rebase--am.shJohannes Schindelin1-4/+0
2019-07-29Merge branch 'js/rebase-cleanup'Junio C Hamano1-5/+1
2019-07-29Merge branch 'ds/close-object-store' into maintJunio C Hamano1-1/+1
2019-07-29Merge branch 'pw/rebase-abort-clean-rewritten' into maintJunio C Hamano1-10/+29
2019-07-29Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maintJunio C Hamano1-3/+7
2019-07-25git: mark cmd_rebase as requiring a worktreeJohannes Schindelin1-4/+0
2019-07-25rebase: fix white-spaceJohannes Schindelin1-1/+1
2019-07-19Merge branch 'nd/tree-walk-with-repo'Junio C Hamano1-2/+2
2019-07-11Merge branch 'js/rebase-reschedule-applies-only-to-interactive'Junio C Hamano1-3/+7
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano1-2/+2
2019-07-09Merge branch 'pw/rebase-abort-clean-rewritten'Junio C Hamano1-10/+29
2019-07-09Merge branch 'ds/close-object-store'Junio C Hamano1-1/+1
2019-07-01rebase --am: ignore rebase.rescheduleFailedExecJohannes Schindelin1-3/+7
2019-06-27tree-walk.c: remove the_repo from fill_tree_descriptor()Nguyễn Thái Ngọc Duy1-2/+2
2019-06-13Merge branch 'js/rebase-cleanup'Junio C Hamano1-6/+1
2019-06-13Merge branch 'jk/unused-params-final-batch'Junio C Hamano1-1/+1
2019-06-12packfile: rename close_all_packs to close_object_storeDerrick Stolee1-1/+1
2019-05-30Merge branch 'js/rebase-config-bitfix'Junio C Hamano1-1/+1
2019-05-28rebase: replace incorrect logical negation by correct bitwise oneJohannes Schindelin1-1/+1
2019-05-15rebase --abort/--quit: cleanup refs/rewrittenPhillip Wood1-9/+25
2019-05-15rebase: warn if state directory cannot be removedPhillip Wood1-3/+5
2019-05-15rebase: fix a memory leakPhillip Wood1-0/+1
2019-05-15rebase: fold git-rebase--common into the -p backendJohannes Schindelin1-2/+1
2019-05-15Drop unused git-rebase--am.shJohannes Schindelin1-4/+0
2019-05-13Merge branch 'pw/rebase-i-internal'Junio C Hamano1-113/+465
2019-05-09Merge branch 'nd/sha1-name-c-wo-the-repository'Junio C Hamano1-3/+2
2019-04-19rebase -i: run without forking rebase--interactivePhillip Wood1-135/+86
2019-04-19rebase: use a common action enumPhillip Wood1-43/+48
2019-04-19rebase -i: use struct rebase_options in do_interactive_rebase()Phillip Wood1-33/+36
2019-04-19rebase -i: use struct rebase_options to parse argsPhillip Wood1-91/+112
2019-04-19rebase -i: use struct object_id for squash_ontoPhillip Wood1-8/+13
2019-04-19rebase -i: use struct commit when parsing optionsPhillip Wood1-18/+24
2019-04-19rebase -i: remove duplicationPhillip Wood1-3/+2
2019-04-19rebase -i: combine rebase--interactive.c with rebase.cPhillip Wood1-0/+367
2019-04-19rebase: use OPT_RERERE_AUTOUPDATE()Phillip Wood1-17/+13
2019-04-19rebase: rename write_basic_state()Phillip Wood1-2/+2
2019-04-19rebase: don't translate trace stringsPhillip Wood1-8/+7
2019-04-16Merge branch 'ab/drop-scripted-rebase'Junio C Hamano1-39/+11
2019-04-10Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano1-2/+6
2019-04-08builtin rebase: use oideq()SZEDER Gábor1-1/+1
2019-04-08builtin rebase: use FREE_AND_NULLSZEDER Gábor1-2/+1
2019-04-02checkout: inform the user when removing branch stateNguyễn Thái Ngọc Duy1-2/+2
2019-03-20Merge branch 'js/rebase-orig-head-fix'Junio C Hamano1-16/+22
2019-03-20rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason1-39/+11
2019-03-12rebase: deprecate --preserve-mergesJohannes Schindelin1-2/+6
2019-03-04built-in rebase: set ORIG_HEAD just once, before the rebaseJohannes Schindelin1-13/+18
2019-03-04built-in rebase: use the correct reflog when switching branchesJohannes Schindelin1-1/+1
2019-03-04built-in rebase: no need to check out `onto` twiceJohannes Schindelin1-2/+2
2019-02-22trace2:data: add subverb for rebaseJeff Hostetler1-0/+17
2019-02-11Fix typos in translatable strings for v2.21.0Jean-Noël Avila1-1/+1
2019-02-08Merge branch 'js/rebase-i-redo-exec-fix'Junio C Hamano1-21/+0
2019-02-06Merge branch 'pw/rebase-x-sanity-check'Junio C Hamano1-0/+17
2019-02-06Merge branch 'nd/the-index-final'Junio C Hamano1-7/+7
2019-02-06Merge branch 'js/rebase-am'Junio C Hamano1-125/+311
2019-02-06Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano1-20/+10
2019-02-06Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Johannes Schindelin1-21/+0
2019-02-05Merge branch 'pw/no-editor-in-rebase-i-implicit'Junio C Hamano1-2/+3
2019-01-29rebase -x: sanity check commandPhillip Wood1-0/+17
2019-01-29Merge branch 'os/rebase-runs-post-checkout-hook'Junio C Hamano1-2/+10
2019-01-29Merge branch 'js/rebase-i-redo-exec'Junio C Hamano1-1/+41
2019-01-28implicit interactive rebase: don't run sequence editorPhillip Wood1-2/+3
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy1-0/+1
2019-01-18built-in rebase: call `git am` directlyJohannes Schindelin1-0/+179
2019-01-18rebase: teach `reset_head()` to optionally skip the worktreeJohannes Schindelin1-1/+7
2019-01-18rebase: avoid double reflog entry when switching branchesJohannes Schindelin1-3/+4
2019-01-18rebase: move `reset_head()` into a better spotJohannes Schindelin1-119/+119
2019-01-14read-cache.c: replace update_index_if_able with repo_&Nguyễn Thái Ngọc Duy1-3/+2
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy1-4/+4
2019-01-07rebase: implement --merge via the interactive machineryElijah Newren1-9/+6
2019-01-04Merge branch 'nd/the-index'Junio C Hamano1-8/+9
2019-01-02rebase: run post-checkout hook on checkoutOrgad Shaneh1-2/+10
2018-12-28git-rebase, sequencer: extend --quiet option for the interactive machineryElijah Newren1-4/+1
2018-12-28rebase: fix incompatible options error messageElijah Newren1-7/+3
2018-12-28rebase: make builtin and legacy script error messages the sameElijah Newren1-5/+5
2018-12-11rebase: introduce a shortcut for --reschedule-failed-execJohannes Schindelin1-0/+21
2018-12-11rebase: add a config option to default to --reschedule-failed-execJohannes Schindelin1-0/+5
2018-12-11rebase: introduce --reschedule-failed-execJohannes Schindelin1-1/+15
2018-12-01Merge branch 'rt/rebase-in-c-message-fix'Junio C Hamano1-2/+2
2018-12-01Merge branch 'js/rebase-stat-unrelated-fix'Junio C Hamano1-6/+12
2018-12-01builtin/rebase.c: remove superfluous space in messagesRalf Thielow1-2/+2
2018-11-30rebase --stat: fix when rebasing to an unrelated historyJohannes Schindelin1-6/+12
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-08 10:14:00 +0000