summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)AuthorFilesLines
2020-03-05Merge branch 'ag/rebase-remove-redundant-code'Libravatar Junio C Hamano1-9/+1
2020-03-05Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'Libravatar Junio C Hamano1-2/+3
2020-03-02Merge branch 'en/rebase-backend'Libravatar Junio C Hamano1-78/+179
2020-02-26builtin/rebase: remove a call to get_oid() on `options.switch_to'Libravatar Alban Gruin1-9/+1
2020-02-24rebase: refuse to switch to branch already checked out elsewhereLibravatar Eric Sunshine1-2/+3
2020-02-16rebase: rename the two primary rebase backendsLibravatar Elijah Newren1-52/+47
2020-02-16rebase: change the default backend from "am" to "merge"Libravatar Elijah Newren1-2/+2
2020-02-16rebase: make the backend configurable via config settingLibravatar Elijah Newren1-7/+24
2020-02-16rebase: drop '-i' from the reflog for interactive-based rebasesLibravatar Elijah Newren1-1/+1
2020-02-16rebase: add an --am optionLibravatar Elijah Newren1-1/+17
2020-02-16rebase: move incompatibility checks between backend options a bit earlierLibravatar Elijah Newren1-11/+11
2020-02-16rebase: allow more types of rebases to fast-forwardLibravatar Elijah Newren1-4/+14
2020-02-16rebase: fix handling of restrict_revisionLibravatar Elijah Newren1-2/+2
2020-02-16rebase: make sure to pass along the quiet flag to the sequencerLibravatar Elijah Newren1-1/+2
2020-02-16rebase, sequencer: remove the broken GIT_QUIET handlingLibravatar Elijah Newren1-4/+2
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyLibravatar Elijah Newren1-0/+52
2020-02-16rebase (interactive-backend): make --keep-empty the defaultLibravatar Elijah Newren1-9/+19
2020-02-14Merge branch 'ag/rebase-avoid-unneeded-checkout'Libravatar Junio C Hamano1-13/+5
2020-01-24rebase -i: stop checking out the tip of the branch to rebaseLibravatar Alban Gruin1-13/+5
2020-01-17git-rebase.txt: update description of --allow-empty-messageLibravatar Elijah Newren1-5/+7
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Libravatar Junio C Hamano1-37/+12
2020-01-02Merge branch 'en/rebase-signoff-fix'Libravatar Junio C Hamano1-1/+1
2019-12-20rebase: fix saving of --signoff state for am-based rebasesLibravatar Elijah Newren1-1/+1
2019-12-16Merge branch 'dl/rebase-with-autobase'Libravatar Junio C Hamano1-1/+2
2019-12-16Merge branch 'ag/sequencer-todo-updates'Libravatar Junio C Hamano1-0/+6
2019-12-10Merge branch 'ra/rebase-i-more-options'Libravatar Junio C Hamano1-12/+36
2019-12-05rebase: fix format.useAutoBase breakageLibravatar Denton Liu1-1/+2
2019-11-25rebase -i: finishing touches to --reset-author-dateLibravatar Junio C Hamano1-3/+3
2019-11-25rebase: fill `squash_onto' in get_replay_opts()Libravatar Alban Gruin1-0/+5
2019-11-10Merge branch 'js/rebase-deprecate-preserve-merges'Libravatar Junio C Hamano1-3/+4
2019-11-02rebase: add --reset-author-dateLibravatar Rohit Ashiwal1-0/+2
2019-11-02rebase -i: support --ignore-dateLibravatar Rohit Ashiwal1-5/+9
2019-11-02rebase -i: support --committer-date-is-author-dateLibravatar Rohit Ashiwal1-5/+12
2019-11-02rebase -i: add --ignore-whitespace flagLibravatar Rohit Ashiwal1-4/+15
2019-10-21rebase: hide --preserve-merges optionLibravatar Denton Liu1-3/+4
2019-09-30Merge branch 'bw/rebase-autostash-keep-current-branch'Libravatar Junio C Hamano1-12/+1
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-09-07builtin/rebase.c: Remove pointless messageLibravatar Ben Wijen1-15/+1
2019-09-07builtin/rebase.c: make sure the active branch isn't moved when autostashingLibravatar Ben Wijen1-3/+6
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-29Merge branch 'ds/close-object-store' into maintLibravatar Junio C Hamano1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 16:51:36 +0000