summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)AuthorFilesLines
2020-05-13Merge branch 'jc/auto-gc-quiet'Libravatar Junio C Hamano1-2/+1
2020-05-07auto-gc: pass --quiet down from am, commit, merge and rebaseLibravatar Junio C Hamano1-2/+1
2020-05-05Merge branch 'dl/opt-callback-cleanup'Libravatar Junio C Hamano1-10/+10
2020-05-01Merge branch 'en/rebase-root-and-fork-point-are-incompatible'Libravatar Junio C Hamano1-0/+3
2020-04-29Merge branch 'dl/merge-autostash-rebase-quit-fix'Libravatar Junio C Hamano1-0/+1
2020-04-29Merge branch 'dl/merge-autostash'Libravatar Junio C Hamano1-264/+44
2020-04-28rebase: save autostash entry into stash reflog on --quitLibravatar Denton Liu1-0/+1
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FLibravatar Denton Liu1-10/+10
2020-04-27rebase: display an error if --root and --fork-point are both providedLibravatar Elijah Newren1-0/+3
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Libravatar Junio C Hamano1-0/+7
2020-04-22Merge branch 'en/rebase-no-keep-empty'Libravatar Junio C Hamano1-7/+10
2020-04-22Merge branch 'dd/no-gpg-sign'Libravatar Junio C Hamano1-3/+4
2020-04-11rebase --merge: optionally skip upstreamed commitsLibravatar Jonathan Tan1-0/+7
2020-04-11rebase: fix an incompatible-options error messageLibravatar Elijah Newren1-1/+1
2020-04-11rebase: reinstate --no-keep-emptyLibravatar Elijah Newren1-6/+9
2020-04-10merge: teach --autostash optionLibravatar Denton Liu1-2/+1
2020-04-10sequencer: extract perform_autostash() from rebaseLibravatar Denton Liu1-49/+0
2020-04-10rebase: generify create_autostash()Libravatar Denton Liu1-16/+16
2020-04-10rebase: extract create_autostash()Libravatar Denton Liu1-44/+50
2020-04-10reset: extract reset_head() from rebaseLibravatar Denton Liu1-138/+1
2020-04-10rebase: generify reset_head()Libravatar Denton Liu1-27/+37
2020-04-10rebase: use apply_autostash() from sequencer.cLibravatar Denton Liu1-47/+2
2020-04-10rebase: use read_oneliner()Libravatar Denton Liu1-20/+17
2020-04-03rebase.c: honour --no-gpg-signLibravatar Đoàn Trần Công Danh1-3/+4
2020-03-26Merge branch 'bc/filter-process'Libravatar Junio C Hamano1-0/+1
2020-03-16builtin/rebase: compute checkout metadata for rebasesLibravatar brian m. carlson1-0/+1
2020-03-12Merge branch 'en/rebase-backend'Libravatar Junio C Hamano1-1/+1
2020-03-11i18n: unmark a message in rebase.cLibravatar Jiang Xin1-1/+1
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 14:38:53 +0000