diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:50 -0700 |
| commit | f72e06703b14b3bccaaeee97ac82257dff67749c (patch) | |
| tree | 10bfc3810c6301b1ce4dd9a5d338c15e0640678a /oidmap.h | |
| parent | Merge branch 'jk/oid-array-cleanups' (diff) | |
| parent | t3432: test `--merge' with `rebase.abbreviateCommands = true', too (diff) | |
| download | tgif-f72e06703b14b3bccaaeee97ac82257dff67749c.tar.xz | |
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 'oidmap.h')
0 files changed, 0 insertions, 0 deletions