projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 68e7090) | patch
t3432: test `--merge' with `rebase.abbreviateCommands = true', too
authorAlban Gruin <alban.gruin@gmail.com>
Mon, 30 Mar 2020 12:42:36 +0000 (14:42 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Mar 2020 19:47:25 +0000 (12:47 -0700)
commitde9f1d3ef45ec885339d04f9e34293eb2de8605d
treeba47680d303fe14f9881f548bd63cc7662451c16tree | snapshot
parent68e7090f31b4d4f2c7b9a25240af61149fbebb5ccommit | diff
t3432: test `--merge' with `rebase.abbreviateCommands = true', too

When fast forwarding, `git --merge' should act the same whether
`rebase.abbreviateCommands' is set or not, but so far it was not the
case.  This duplicates the tests ensuring that `--merge' works when fast
forwarding to check if it also works with abbreviated commands.

Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3432-rebase-fast-forward.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.