summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)AuthorFilesLines
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-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: 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-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
2019-03-12rebase: deprecate --preserve-mergesLibravatar Johannes Schindelin1-2/+6
2019-03-04built-in rebase: set ORIG_HEAD just once, before the rebaseLibravatar Johannes Schindelin1-13/+18
2019-03-04built-in rebase: use the correct reflog when switching branchesLibravatar Johannes Schindelin1-1/+1
2019-03-04built-in rebase: no need to check out `onto` twiceLibravatar Johannes Schindelin1-2/+2
2019-02-22trace2:data: add subverb for rebaseLibravatar Jeff Hostetler1-0/+17
2019-02-11Fix typos in translatable strings for v2.21.0Libravatar Jean-Noël Avila1-1/+1
2019-02-08Merge branch 'js/rebase-i-redo-exec-fix'Libravatar Junio C Hamano1-21/+0
2019-02-06Merge branch 'pw/rebase-x-sanity-check'Libravatar Junio C Hamano1-0/+17
2019-02-06Merge branch 'nd/the-index-final'Libravatar Junio C Hamano1-7/+7
2019-02-06Merge branch 'js/rebase-am'Libravatar Junio C Hamano1-125/+311
2019-02-06Merge branch 'en/rebase-merge-on-sequencer'Libravatar Junio C Hamano1-20/+10
2019-02-06Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Libravatar Johannes Schindelin1-21/+0
2019-02-05Merge branch 'pw/no-editor-in-rebase-i-implicit'Libravatar Junio C Hamano1-2/+3
2019-01-29rebase -x: sanity check commandLibravatar Phillip Wood1-0/+17
2019-01-29Merge branch 'os/rebase-runs-post-checkout-hook'Libravatar Junio C Hamano1-2/+10
2019-01-29Merge branch 'js/rebase-i-redo-exec'Libravatar Junio C Hamano1-1/+41
2019-01-28implicit interactive rebase: don't run sequence editorLibravatar Phillip Wood1-2/+3
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2019-01-18built-in rebase: call `git am` directlyLibravatar Johannes Schindelin1-0/+179
2019-01-18rebase: teach `reset_head()` to optionally skip the worktreeLibravatar Johannes Schindelin1-1/+7
2019-01-18rebase: avoid double reflog entry when switching branchesLibravatar Johannes Schindelin1-3/+4
2019-01-18rebase: move `reset_head()` into a better spotLibravatar Johannes Schindelin1-119/+119
2019-01-14read-cache.c: replace update_index_if_able with repo_&Libravatar Nguyễn Thái Ngọc Duy1-3/+2
2019-01-14read-cache.c: kill read_index()Libravatar Nguyễn Thái Ngọc Duy1-4/+4
2019-01-07rebase: implement --merge via the interactive machineryLibravatar Elijah Newren1-9/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 17:54:08 +0000