From: Stephan Beyer <s-beyer@gmx.net>
To: Stefan Beller <sbeller@google.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Git <git@vger.kernel.org>
Subject: Re: [BUG] rebase -i with only empty commits
Date: Wed, 23 Aug 2017 20:06:15 +0200 [thread overview]
Message-ID: <565221dd-b66f-8b88-1bdd-8d0d55c4dc96@gmx.net> (raw)
In-Reply-To: <CAGZ79ka-SS8ZyZkp6d=0iNtTtQgh2cAhzJSt4m22F88vb1rbhw@mail.gmail.com>
On 08/23/2017 07:29 PM, Stefan Beller wrote:
> On Wed, Aug 23, 2017 at 8:19 AM, Stephan Beyer <s-beyer@gmx.net> wrote:
>> On 08/23/2017 04:40 PM, Johannes Schindelin wrote:
>>> These days, I reflexively type `rebase -ki` instead of `rebase -i`. Maybe
>>> you want to do that, too?
>>
>> That's a very valuable hint, thank you very much!
>
> While -k side steps the original problem, it seems like it would
> have helped me, too.
>
> Is there any value in discussing turning it on by default?
I also wondered why empty commits are "discriminated" in such a way.
I first thought that if you rebase branch A onto B but branch A and B
contain commits with the same changes, then these commits would become
new empty commits instead of simply being ignored. But I just checked
this theory and it is now falsified :)
It seems empty commits occur *only* if the user wants them to occur
(--allow-empty). If they occur unintentionally (for example, by
importing some SVN), one can eliminate them using filter-branch or
rebase (by commenting out these picks).
So it is still unclear to me, why empty commits are handled in such a
special way.
Best
Stephan
PS: Although -k helps, the original behavior of rebase -i is still a bug.
next prev parent reply other threads:[~2017-08-23 18:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-22 23:08 [BUG] rebase -i with empty commits + exec Stefan Beller
2017-08-23 9:08 ` [BUG] rebase -i with only empty commits Stephan Beyer
2017-08-23 14:40 ` Johannes Schindelin
2017-08-23 15:19 ` Stephan Beyer
2017-08-23 17:29 ` Stefan Beller
2017-08-23 18:06 ` Stephan Beyer [this message]
2017-08-23 18:29 ` Junio C Hamano
2017-08-23 22:42 ` Philip Oakley
2017-08-24 13:35 ` Phillip Wood
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=565221dd-b66f-8b88-1bdd-8d0d55c4dc96@gmx.net \
--to=s-beyer@gmx.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=sbeller@google.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.