From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
To: git@vger.kernel.org
Subject: git rebase fast-forward fails with abbreviateCommands
Date: Fri, 27 Mar 2020 12:44:57 +0100 [thread overview]
Message-ID: <9b4bc756764d87c9f34c11e6ec2fc6482f531805.camel@gmail.com> (raw)
Hi,
Since 2.26.0 a simple "git rebase" fails to fast-forward a
branch, reporting "error: nothing to do."
It started to work again after removing my gitconfig. I've
reduced it to the following:
git init foo; cd foo
git commit --allow-empty -m foo
git commit --allow-empty -m bar
git checkout -tb foo
git reset HEAD~
git -c rebase.abbreviateCommands=true rebase
next reply other threads:[~2020-03-27 11:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 11:44 Jan Alexander Steffens (heftig) [this message]
2020-03-27 15:46 ` git rebase fast-forward fails with abbreviateCommands Alban Gruin
2020-03-27 18:39 ` Elijah Newren
2020-03-27 18:44 ` Jan Alexander Steffens (heftig)
2020-03-28 12:21 ` Alban Gruin
2020-03-27 21:33 ` Junio C Hamano
2020-03-30 12:42 ` [PATCH v1 0/2] rebase --merge: fix fast forwarding when `rebase.abbreviateCommands' is set Alban Gruin
2020-03-30 12:42 ` [PATCH v1 1/2] sequencer: don't abbreviate a command if it doesn't have a short form Alban Gruin
2020-03-30 17:50 ` Junio C Hamano
2020-03-30 18:15 ` Eric Sunshine
2020-03-30 12:42 ` [PATCH v1 2/2] t3432: test `--merge' with `rebase.abbreviateCommands = true', too Alban Gruin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9b4bc756764d87c9f34c11e6ec2fc6482f531805.camel@gmail.com \
--to=jan.steffens@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).