summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)Author
13 daysMerge branch 'jc/auto-gc-quiet'Junio C Hamano
2020-05-07auto-gc: pass --quiet down from am, commit, merge and rebaseJunio C Hamano
2020-05-05Merge branch 'dl/opt-callback-cleanup'Junio C Hamano
2020-05-01Merge branch 'en/rebase-root-and-fork-point-are-incompatible'Junio C Hamano
2020-04-29Merge branch 'dl/merge-autostash-rebase-quit-fix'Junio C Hamano
2020-04-29Merge branch 'dl/merge-autostash'Junio C Hamano
2020-04-28rebase: save autostash entry into stash reflog on --quitDenton Liu
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu
2020-04-27rebase: display an error if --root and --fork-point are both providedElijah Newren
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Junio C Hamano
2020-04-22Merge branch 'en/rebase-no-keep-empty'Junio C Hamano
2020-04-22Merge branch 'dd/no-gpg-sign'Junio C Hamano
2020-04-11rebase --merge: optionally skip upstreamed commitsJonathan Tan
2020-04-11rebase: fix an incompatible-options error messageElijah Newren
2020-04-11rebase: reinstate --no-keep-emptyElijah Newren
2020-04-10merge: teach --autostash optionDenton Liu
2020-04-10sequencer: extract perform_autostash() from rebaseDenton Liu
2020-04-10rebase: generify create_autostash()Denton Liu
2020-04-10rebase: extract create_autostash()Denton Liu
2020-04-10reset: extract reset_head() from rebaseDenton Liu
2020-04-10rebase: generify reset_head()Denton Liu
2020-04-10rebase: use apply_autostash() from sequencer.cDenton Liu
2020-04-10rebase: use read_oneliner()Denton Liu
2020-04-03rebase.c: honour --no-gpg-signĐoàn Trần Công Danh
2020-03-27Merge branch 'bc/filter-process'Junio C Hamano
2020-03-16builtin/rebase: compute checkout metadata for rebasesbrian m. carlson
2020-03-12Merge branch 'en/rebase-backend'Junio C Hamano
2020-03-11i18n: unmark a message in rebase.cJiang Xin
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