summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-22 13:42:50 -0700
committerJunio C Hamano <gitster@pobox.com>2020-04-22 13:42:50 -0700
commitf72e06703b14b3bccaaeee97ac82257dff67749c (patch)
tree10bfc3810c6301b1ce4dd9a5d338c15e0640678a /commit.c
parenta768f866e9233b758cb21e25c7b8c985b0009c1f (diff)
parentde9f1d3ef45ec885339d04f9e34293eb2de8605d (diff)
Merge branch 'ag/rebase-merge-allow-ff-under-abbrev-command'
"git rebase" with the merge backend did not work well when the rebase.abbreviateCommands configuration was set. * ag/rebase-merge-allow-ff-under-abbrev-command: t3432: test `--merge' with `rebase.abbreviateCommands = true', too sequencer: don't abbreviate a command if it doesn't have a short form
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions