summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)Author
2020-03-05Merge branch 'ag/rebase-remove-redundant-code'Junio C Hamano
2020-03-05Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'Junio C Hamano
2020-03-02Merge branch 'en/rebase-backend'Junio C Hamano
2020-02-26builtin/rebase: remove a call to get_oid() on `options.switch_to'Alban Gruin
2020-02-24rebase: refuse to switch to branch already checked out elsewhereEric Sunshine
2020-02-16rebase: rename the two primary rebase backendsElijah Newren
2020-02-16rebase: change the default backend from "am" to "merge"Elijah Newren
2020-02-16rebase: make the backend configurable via config settingElijah Newren
2020-02-16rebase: drop '-i' from the reflog for interactive-based rebasesElijah Newren
2020-02-16rebase: add an --am optionElijah Newren
2020-02-16rebase: move incompatibility checks between backend options a bit earlierElijah Newren
2020-02-16rebase: allow more types of rebases to fast-forwardElijah Newren
2020-02-16rebase: fix handling of restrict_revisionElijah Newren
2020-02-16rebase: make sure to pass along the quiet flag to the sequencerElijah Newren
2020-02-16rebase, sequencer: remove the broken GIT_QUIET handlingElijah Newren
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyElijah Newren
2020-02-16rebase (interactive-backend): make --keep-empty the defaultElijah Newren
2020-02-14Merge branch 'ag/rebase-avoid-unneeded-checkout'Junio C Hamano
2020-01-24rebase -i: stop checking out the tip of the branch to rebaseAlban Gruin
2020-01-17git-rebase.txt: update description of --allow-empty-messageElijah Newren
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano
2020-01-02Merge branch 'en/rebase-signoff-fix'Junio C Hamano
2019-12-20rebase: fix saving of --signoff state for am-based rebasesElijah Newren
2019-12-16Merge branch 'dl/rebase-with-autobase'Junio C Hamano
2019-12-16Merge branch 'ag/sequencer-todo-updates'Junio C Hamano
2019-12-10Merge branch 'ra/rebase-i-more-options'Junio C Hamano
2019-12-05rebase: fix format.useAutoBase breakageDenton Liu
2019-11-25rebase -i: finishing touches to --reset-author-dateJunio C Hamano
2019-11-25rebase: fill `squash_onto' in get_replay_opts()Alban Gruin
2019-11-10Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano
2019-11-02rebase: add --reset-author-dateRohit Ashiwal
2019-11-02rebase -i: support --ignore-dateRohit Ashiwal
2019-11-02rebase -i: support --committer-date-is-author-dateRohit Ashiwal
2019-11-02rebase -i: add --ignore-whitespace flagRohit Ashiwal
2019-10-21rebase: hide --preserve-merges optionDenton Liu
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-29Merge branch 'ds/close-object-store' into maintJunio C Hamano