Fast Version Control System
c2ee27a40e
Quoting from the upstream patch: Jan Alexander Steffens reported that when `rebase.abbreviateCommands' is set, the merge backend fails to fast forward. This is because the backend generates a todo list with only a `noop', and since this command has no abbreviated form, it is replaced by a comment mark. The sequencer then interprets it as if there is nothing to do, and fails. References: https://github.com/git/git/commit/68e7090f31 https://lore.kernel.org/git/9b4bc756764d87c9f34c11e6ec2fc6482f531805.camel@gmail.com/ |
||
|---|---|---|
| .gitignore | ||
| .mailmap | ||
| 0001-sequencer-don-t-abbreviate-a-command-if-it-doesn-t-h.patch | ||
| 0002-t3432-test-merge-with-rebase.abbreviateCommands-true.patch | ||
| git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch | ||
| git-gui.desktop | ||
| git.rpmlintrc | ||
| git.skip-test-patterns | ||
| git.socket | ||
| git.spec | ||
| git.xinetd.in | ||
| git@.service.in | ||
| gitweb-httpd.conf | ||
| gitweb.conf.in | ||
| gpgkey-junio.asc | ||
| print-failed-test-output | ||
| sources | ||