]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a5b5740) | patch
rebase: handle --strategy via imply_merge() as well
authorOswald Buddenhagen <oswald.buddenhagen@gmx.de>
Fri, 20 Oct 2023 09:36:53 +0000 (11:36 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Oct 2023 21:47:44 +0000 (14:47 -0700)
commit37e80a24716affc5698822393ad9e09646d0be73
tree0c830f81aaedbb9ff00be0d74e95c2f5e4c0b7cetree | snapshot
parenta5b5740bf63cd435fb172b12aa97176f13ff3fd3commit | diff
rebase: handle --strategy via imply_merge() as well

At least after the successive trimming of enum rebase_type mentioned in
the previous commit, this code did exactly what imply_merge() does, so
just call it instead.

Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.