summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorAlban Gruin <alban.gruin@gmail.com>2020-03-30 14:42:36 +0200
committerJunio C Hamano <gitster@pobox.com>2020-03-30 12:47:25 -0700
commitde9f1d3ef45ec885339d04f9e34293eb2de8605d (patch)
treeba47680d303fe14f9881f548bd63cc7662451c16 /commit.c
parent68e7090f31b4d4f2c7b9a25240af61149fbebb5c (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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions