summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)AuthorFilesLines
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
2019-07-29Merge branch 'pw/rebase-abort-clean-rewritten' into maintLibravatar Junio C Hamano1-10/+29
2019-07-29Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maintLibravatar Junio C Hamano1-3/+7
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 06:32:04 +0000