summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)Author
2019-09-30Merge branch 'bw/rebase-autostash-keep-current-branch'Junio C Hamano
2019-09-30Merge branch 'dl/rebase-i-keep-base'Junio C Hamano
2019-09-18Merge branch 'js/rebase-r-strategy'Junio C Hamano
2019-09-07builtin/rebase.c: Remove pointless messageBen Wijen
2019-09-07builtin/rebase.c: make sure the active branch isn't moved when autostashingBen Wijen
2019-08-27rebase: teach rebase --keep-baseDenton Liu
2019-08-27rebase: fast-forward --fork-point in more casesDenton Liu
2019-08-27rebase: fast-forward --onto in more casesDenton Liu
2019-08-27rebase: refactor can_fast_forward into goto towerDenton Liu
2019-07-31rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`Johannes Schindelin
2019-07-31rebase -r: support merge strategies other than `recursive`Johannes Schindelin
2019-07-31rebase: fold git-rebase--common into the -p backendJohannes Schindelin
2019-07-31Drop unused git-rebase--am.shJohannes Schindelin
2019-07-29Merge branch 'js/rebase-cleanup'Junio C Hamano
2019-07-25git: mark cmd_rebase as requiring a worktreeJohannes Schindelin
2019-07-25rebase: fix white-spaceJohannes Schindelin
2019-07-19Merge branch 'nd/tree-walk-with-repo'Junio C Hamano
2019-07-11Merge branch 'js/rebase-reschedule-applies-only-to-interactive'Junio C Hamano
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano
2019-07-09Merge branch 'pw/rebase-abort-clean-rewritten'Junio C Hamano
2019-07-09Merge branch 'ds/close-object-store'Junio C Hamano
2019-07-01rebase --am: ignore rebase.rescheduleFailedExecJohannes Schindelin
2019-06-27tree-walk.c: remove the_repo from fill_tree_descriptor()Nguyễn Thái Ngọc Duy
2019-06-13Merge branch 'js/rebase-cleanup'Junio C Hamano
2019-06-13Merge branch 'jk/unused-params-final-batch'Junio C Hamano
2019-06-12packfile: rename close_all_packs to close_object_storeDerrick Stolee
2019-05-30Merge branch 'js/rebase-config-bitfix'Junio C Hamano
2019-05-28rebase: replace incorrect logical negation by correct bitwise oneJohannes Schindelin
2019-05-15rebase --abort/--quit: cleanup refs/rewrittenPhillip Wood
2019-05-15rebase: warn if state directory cannot be removedPhillip Wood
2019-05-15rebase: fix a memory leakPhillip Wood
2019-05-15rebase: fold git-rebase--common into the -p backendJohannes Schindelin
2019-05-15Drop unused git-rebase--am.shJohannes Schindelin
2019-05-13Merge branch 'pw/rebase-i-internal'Junio C Hamano
2019-05-08Merge branch 'nd/sha1-name-c-wo-the-repository'Junio C Hamano
2019-04-19rebase -i: run without forking rebase--interactivePhillip Wood
2019-04-19rebase: use a common action enumPhillip Wood
2019-04-19rebase -i: use struct rebase_options in do_interactive_rebase()Phillip Wood
2019-04-19rebase -i: use struct rebase_options to parse argsPhillip Wood
2019-04-19rebase -i: use struct object_id for squash_ontoPhillip Wood
2019-04-19rebase -i: use struct commit when parsing optionsPhillip Wood
2019-04-19rebase -i: remove duplicationPhillip Wood
2019-04-19rebase -i: combine rebase--interactive.c with rebase.cPhillip Wood
2019-04-19rebase: use OPT_RERERE_AUTOUPDATE()Phillip Wood
2019-04-19rebase: rename write_basic_state()Phillip Wood
2019-04-19rebase: don't translate trace stringsPhillip Wood
2019-04-16Merge branch 'ab/drop-scripted-rebase'Junio C Hamano
2019-04-09Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano
2019-04-08builtin rebase: use oideq()SZEDER Gábor
2019-04-08builtin rebase: use FREE_AND_NULLSZEDER Gábor