summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/filter-process'Junio C Hamano2020-03-261-0/+1
|\
| * builtin/rebase: compute checkout metadata for rebasesbrian m. carlson2020-03-161-0/+1
* | Merge branch 'en/rebase-backend'Junio C Hamano2020-03-121-1/+1
|\ \ | |/ |/|
| * i18n: unmark a message in rebase.cJiang Xin2020-03-111-1/+1
* | Merge branch 'ag/rebase-remove-redundant-code'Junio C Hamano2020-03-051-9/+1
|\ \
| * | builtin/rebase: remove a call to get_oid() on `options.switch_to'Alban Gruin2020-02-261-9/+1
* | | Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'Junio C Hamano2020-03-051-2/+3
|\ \ \
| * | | rebase: refuse to switch to branch already checked out elsewhereEric Sunshine2020-02-241-2/+3
| |/ /
* | | Merge branch 'en/rebase-backend'Junio C Hamano2020-03-021-78/+179
|\ \ \ | | |/ | |/|
| * | rebase: rename the two primary rebase backendsElijah Newren2020-02-161-52/+47
| * | rebase: change the default backend from "am" to "merge"Elijah Newren2020-02-161-2/+2
| * | rebase: make the backend configurable via config settingElijah Newren2020-02-161-7/+24
| * | rebase: drop '-i' from the reflog for interactive-based rebasesElijah Newren2020-02-161-1/+1
| * | rebase: add an --am optionElijah Newren2020-02-161-1/+17
| * | rebase: move incompatibility checks between backend options a bit earlierElijah Newren2020-02-161-11/+11
| * | rebase: allow more types of rebases to fast-forwardElijah Newren2020-02-161-4/+14
| * | rebase: fix handling of restrict_revisionElijah Newren2020-02-161-2/+2
| * | rebase: make sure to pass along the quiet flag to the sequencerElijah Newren2020-02-161-1/+2
| * | rebase, sequencer: remove the broken GIT_QUIET handlingElijah Newren2020-02-161-4/+2
| * | rebase (interactive-backend): fix handling of commits that become emptyElijah Newren2020-02-161-0/+52
| * | rebase (interactive-backend): make --keep-empty the defaultElijah Newren2020-02-161-9/+19
| * | git-rebase.txt: update description of --allow-empty-messageElijah Newren2020-01-171-5/+7
| |/
* | Merge branch 'ag/rebase-avoid-unneeded-checkout'Junio C Hamano2020-02-141-13/+5
|\ \ | |/ |/|
| * rebase -i: stop checking out the tip of the branch to rebaseAlban Gruin2020-01-241-13/+5
* | Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano2020-01-121-37/+12
* | Merge branch 'en/rebase-signoff-fix'Junio C Hamano2020-01-021-1/+1
|\ \
| * | rebase: fix saving of --signoff state for am-based rebasesElijah Newren2019-12-201-1/+1
* | | Merge branch 'dl/rebase-with-autobase'Junio C Hamano2019-12-161-1/+2
|\ \ \
| * | | rebase: fix format.useAutoBase breakageDenton Liu2019-12-051-1/+2
* | | | Merge branch 'ag/sequencer-todo-updates'Junio C Hamano2019-12-161-0/+6
|\ \ \ \
| * | | | rebase: fill `squash_onto' in get_replay_opts()Alban Gruin2019-11-251-0/+5
| | |/ / | |/| |
* | | | Merge branch 'ra/rebase-i-more-options'Junio C Hamano2019-12-101-12/+36
|\ \ \ \ | |_|/ / |/| | |
| * | | rebase -i: finishing touches to --reset-author-dateJunio C Hamano2019-11-251-3/+3
| * | | rebase: add --reset-author-dateRohit Ashiwal2019-11-021-0/+2
| * | | rebase -i: support --ignore-dateRohit Ashiwal2019-11-021-5/+9
| * | | rebase -i: support --committer-date-is-author-dateRohit Ashiwal2019-11-021-5/+12
| * | | rebase -i: add --ignore-whitespace flagRohit Ashiwal2019-11-021-4/+15
| * | | Merge branch 'ds/close-object-store' into maintJunio C Hamano2019-07-291-1/+1
| |\ \ \
| * \ \ \ Merge branch 'pw/rebase-abort-clean-rewritten' into maintJunio C Hamano2019-07-291-10/+29
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maintJunio C Hamano2019-07-291-3/+7
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano2019-11-101-3/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | rebase: hide --preserve-merges optionDenton Liu2019-10-211-3/+4
* | | | | | | Merge branch 'bw/rebase-autostash-keep-current-branch'Junio C Hamano2019-09-301-12/+1
|\ \ \ \ \ \ \
| * | | | | | | builtin/rebase.c: Remove pointless messageBen Wijen2019-09-071-15/+1
| * | | | | | | builtin/rebase.c: make sure the active branch isn't moved when autostashingBen Wijen2019-09-071-3/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'dl/rebase-i-keep-base'Junio C Hamano2019-09-301-22/+62
|\ \ \ \ \ \ \
| * | | | | | | rebase: teach rebase --keep-baseDenton Liu2019-08-271-6/+26
| * | | | | | | rebase: fast-forward --fork-point in more casesDenton Liu2019-08-271-3/+7
| * | | | | | | rebase: fast-forward --onto in more casesDenton Liu2019-08-271-8/+19
| * | | | | | | rebase: refactor can_fast_forward into goto towerDenton Liu2019-08-271-8/+13
| |/ / / / / /
View Lorry Controller Status