]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a768f86 de9f1d3)
Merge branch 'ag/rebase-merge-allow-ff-under-abbrev-command'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2020 20:42:50 +0000 (13:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2020 20:42:50 +0000 (13:42 -0700)
commitf72e06703b14b3bccaaeee97ac82257dff67749c
tree10bfc3810c6301b1ce4dd9a5d338c15e0640678atree | snapshot
parenta768f866e9233b758cb21e25c7b8c985b0009c1fcommit | diff
parentde9f1d3ef45ec885339d04f9e34293eb2de8605dcommit | 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
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.