summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)AuthorFilesLines
2019-09-30Merge branch 'dl/rebase-i-keep-base'Libravatar Junio C Hamano1-22/+62
2019-09-18Merge branch 'js/rebase-r-strategy'Libravatar Junio C Hamano1-11/+5
2019-08-27rebase: teach rebase --keep-baseLibravatar Denton Liu1-6/+26
2019-08-27rebase: fast-forward --fork-point in more casesLibravatar Denton Liu1-3/+7
2019-08-27rebase: fast-forward --onto in more casesLibravatar Denton Liu1-8/+19
2019-08-27rebase: refactor can_fast_forward into goto towerLibravatar Denton Liu1-8/+13
2019-07-31rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`Libravatar Johannes Schindelin1-2/+5
2019-07-31rebase -r: support merge strategies other than `recursive`Libravatar Johannes Schindelin1-9/+0
2019-07-31rebase: fold git-rebase--common into the -p backendLibravatar Johannes Schindelin1-2/+1
2019-07-31Drop unused git-rebase--am.shLibravatar Johannes Schindelin1-4/+0
2019-07-29Merge branch 'js/rebase-cleanup'Libravatar Junio C Hamano1-5/+1
2019-07-25git: mark cmd_rebase as requiring a worktreeLibravatar Johannes Schindelin1-4/+0
2019-07-25rebase: fix white-spaceLibravatar Johannes Schindelin1-1/+1
2019-07-19Merge branch 'nd/tree-walk-with-repo'Libravatar Junio C Hamano1-2/+2
2019-07-11Merge branch 'js/rebase-reschedule-applies-only-to-interactive'Libravatar Junio C Hamano1-3/+7
2019-07-09Merge branch 'nd/switch-and-restore'Libravatar Junio C Hamano1-2/+2
2019-07-09Merge branch 'pw/rebase-abort-clean-rewritten'Libravatar Junio C Hamano1-10/+29
2019-07-09Merge branch 'ds/close-object-store'Libravatar Junio C Hamano1-1/+1
2019-07-01rebase --am: ignore rebase.rescheduleFailedExecLibravatar Johannes Schindelin1-3/+7
2019-06-27tree-walk.c: remove the_repo from fill_tree_descriptor()Libravatar Nguyễn Thái Ngọc Duy1-2/+2
2019-06-13Merge branch 'js/rebase-cleanup'Libravatar Junio C Hamano1-6/+1
2019-06-13Merge branch 'jk/unused-params-final-batch'Libravatar Junio C Hamano1-1/+1
2019-06-12packfile: rename close_all_packs to close_object_storeLibravatar Derrick Stolee1-1/+1
2019-05-30Merge branch 'js/rebase-config-bitfix'Libravatar Junio C Hamano1-1/+1
2019-05-28rebase: replace incorrect logical negation by correct bitwise oneLibravatar Johannes Schindelin1-1/+1
2019-05-15rebase --abort/--quit: cleanup refs/rewrittenLibravatar Phillip Wood1-9/+25
2019-05-15rebase: warn if state directory cannot be removedLibravatar Phillip Wood1-3/+5
2019-05-15rebase: fix a memory leakLibravatar Phillip Wood1-0/+1
2019-05-15rebase: fold git-rebase--common into the -p backendLibravatar Johannes Schindelin1-2/+1
2019-05-15Drop unused git-rebase--am.shLibravatar Johannes Schindelin1-4/+0
2019-05-13Merge branch 'pw/rebase-i-internal'Libravatar Junio C Hamano1-113/+465
2019-05-09Merge branch 'nd/sha1-name-c-wo-the-repository'Libravatar Junio C Hamano1-3/+2
2019-04-19rebase -i: run without forking rebase--interactiveLibravatar Phillip Wood1-135/+86
2019-04-19rebase: use a common action enumLibravatar Phillip Wood1-43/+48
2019-04-19rebase -i: use struct rebase_options in do_interactive_rebase()Libravatar Phillip Wood1-33/+36
2019-04-19rebase -i: use struct rebase_options to parse argsLibravatar Phillip Wood1-91/+112
2019-04-19rebase -i: use struct object_id for squash_ontoLibravatar Phillip Wood1-8/+13
2019-04-19rebase -i: use struct commit when parsing optionsLibravatar Phillip Wood1-18/+24
2019-04-19rebase -i: remove duplicationLibravatar Phillip Wood1-3/+2
2019-04-19rebase -i: combine rebase--interactive.c with rebase.cLibravatar Phillip Wood1-0/+367
2019-04-19rebase: use OPT_RERERE_AUTOUPDATE()Libravatar Phillip Wood1-17/+13
2019-04-19rebase: rename write_basic_state()Libravatar Phillip Wood1-2/+2
2019-04-19rebase: don't translate trace stringsLibravatar Phillip Wood1-8/+7
2019-04-16Merge branch 'ab/drop-scripted-rebase'Libravatar Junio C Hamano1-39/+11
2019-04-10Merge branch 'js/rebase-deprecate-preserve-merges'Libravatar Junio C Hamano1-2/+6
2019-04-08builtin rebase: use oideq()Libravatar SZEDER Gábor1-1/+1
2019-04-08builtin rebase: use FREE_AND_NULLLibravatar SZEDER Gábor1-2/+1
2019-04-02checkout: inform the user when removing branch stateLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2019-03-20Merge branch 'js/rebase-orig-head-fix'Libravatar Junio C Hamano1-16/+22
2019-03-20rebase: remove the rebase.useBuiltin settingLibravatar Ævar Arnfjörð Bjarmason1-39/+11
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 21:05:19 +0000