summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
Commit message (Expand)AuthorAgeFilesLines
* rebase: add rebase.updateRefs config optionDerrick Stolee2022-07-191-0/+5
* rebase: add --update-refs optionDerrick Stolee2022-07-191-0/+5
* builtin/rebase: remove a redundant space in l10n stringFangyi Zhou2022-06-161-1/+1
* Merge branch 'po/rebase-preserve-merges'Junio C Hamano2022-06-151-5/+9
|\
| * rebase: translate a die(preserve-merges) messagePhilip Oakley2022-06-061-2/+2
| * rebase: note `preserve` merges may be a pull config optionPhilip Oakley2022-06-061-1/+3
| * rebase: help users when dying with `preserve-merges`Philip Oakley2022-06-061-2/+4
| * rebase.c: state preserve-merges has been removedPhilip Oakley2022-06-061-2/+2
* | Merge branch 'ea/rebase-code-simplify'Junio C Hamano2022-05-111-4/+2
|\ \
| * | rebase: simplify an assignment of options.type in cmd_rebaseEdmundo Carmona Antoranz2022-04-201-4/+2
* | | rebase: use correct base for --keep-base when a branch is givenAlex Henrie2022-04-211-27/+28
| |/ |/|
* | rebase: set REF_HEAD_DETACH in checkout_up_to_date()John Cai2022-03-181-0/+2
* | Merge branch 'ja/i18n-common-messages'Junio C Hamano2022-02-251-1/+1
|\ \
| * | i18n: remove from i18n strings that do not hold translatable partsJean-Noël Avila2022-02-041-1/+1
| |/
* | Merge branch 'pw/use-in-process-checkout-in-rebase'Junio C Hamano2022-02-181-41/+60
|\ \
| * | rebase --apply: set ORIG_HEAD correctlyPhillip Wood2022-01-261-0/+1
| * | rebase --apply: fix reflogPhillip Wood2022-01-261-4/+4
| * | reset_head(): take struct rebase_head_optsPhillip Wood2022-01-261-21/+36
| * | rebase: cleanup reset_head() callsPhillip Wood2022-01-261-2/+2
| * | create_autostash(): remove unneeded parameterPhillip Wood2022-01-261-4/+4
| * | reset_head(): make default_reflog_action optionalPhillip Wood2022-01-261-6/+4
| * | reset_head(): remove action parameterPhillip Wood2022-01-261-7/+7
| * | rebase: factor out checkout for up to date branchPhillip Wood2022-01-261-14/+19
* | | Merge branch 'ab/config-based-hooks-2'Junio C Hamano2022-02-091-1/+2
|\ \ \ | |_|/ |/| |
| * | rebase: convert pre-rebase to use hook.hEmily Shaffer2022-01-071-1/+2
| |/
* | i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila2022-01-051-2/+2
* | i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila2022-01-051-3/+3
|/
* Merge branch 'js/retire-preserve-merges'Junio C Hamano2021-10-181-324/+14
|\
| * rebase: stop mentioning the -p option in commentsJohannes Schindelin2021-09-071-1/+1
| * rebase: remove obsolete code commentJohannes Schindelin2021-09-071-1/+1
| * rebase: drop the internal `rebase--interactive` commandJohannes Schindelin2021-09-071-192/+1
| * rebase: drop support for `--preserve-merges`Johannes Schindelin2021-09-071-127/+11
* | Merge branch 'pw/rebase-of-a-tag-fix'Junio C Hamano2021-10-061-28/+21
|\ \
| * | rebase: dereference tagsPhillip Wood2021-09-221-6/+8
| * | rebase: use lookup_commit_reference_by_name()Phillip Wood2021-09-221-13/+4
| * | rebase: use our standard error return valuePhillip Wood2021-09-221-9/+9
* | | Merge branch 'js/run-command-close-packs'Junio C Hamano2021-09-201-1/+0
|\ \ \
| * | | run_auto_maintenance(): implicitly close the object storeJohannes Schindelin2021-09-091-1/+0
| | |/ | |/|
* | | Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano2021-09-201-0/+6
|\ \ \ | |_|/ |/| |
| * | sparse-index: integrate with cherry-pick and rebaseDerrick Stolee2021-09-091-0/+6
| |/
* | Merge branch 'js/advise-when-skipping-cherry-picked'Junio C Hamano2021-09-101-0/+1
|\ \
| * | sequencer: advise if skipping cherry-picked commitJosh Steadmon2021-08-301-0/+1
| |/
* | Merge branch 'ab/rebase-fatal-fatal-fix'Junio C Hamano2021-09-081-1/+1
|\ \
| * | rebase: emit one "fatal" in "fatal: fatal: <error>"Ævar Arnfjörð Bjarmason2021-08-241-1/+1
* | | Merge branch 'en/ort-becomes-the-default'Junio C Hamano2021-08-301-1/+1
|\ \ \ | |_|/ |/| |
| * | Change default merge backend from recursive to ortElijah Newren2021-08-051-1/+1
| |/
* | builtin/rebase: fix options.strategy memory lifecycleAndrzej Hunt2021-07-261-1/+2
|/
* Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano2021-05-101-2/+2
|\
| * hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-2/+2
* | Merge branch 'ah/plugleaks'Junio C Hamano2021-05-071-0/+1
|\ \
View Lorry Controller Status