diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-31 01:06:01 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-31 01:06:01 +0200 |
| commit | 8778fa8b4f18a3930101825e5bcff62b5348e918 (patch) | |
| tree | 309f07c553653f8f1c2c84b5b506ed47ee48a494 /builtin/rebase.c | |
| parent | Merge branch 'en/merge-strategy-docs' (diff) | |
| parent | Update docs for change of default merge backend (diff) | |
| download | git-8778fa8b4f18a3930101825e5bcff62b5348e918.tar.xz git-8778fa8b4f18a3930101825e5bcff62b5348e918.zip | |
Merge branch 'en/ort-becomes-the-default'
Use `ort` instead of `recursive` as the default merge strategy.
* en/ort-becomes-the-default:
Update docs for change of default merge backend
Change default merge backend from recursive to ort
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 33e0961900..c284a7ace1 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1713,7 +1713,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) int i; if (!options.strategy) - options.strategy = "recursive"; + options.strategy = "ort"; strbuf_reset(&buf); for (i = 0; i < strategy_options.nr; i++) |