All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philip Oakley" <philipoakley@iee.org>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	"Stephan Beyer" <s-beyer@gmx.net>
Cc: "Git" <git@vger.kernel.org>
Subject: Re: [BUG] rebase -i with only empty commits
Date: Wed, 23 Aug 2017 23:42:55 +0100	[thread overview]
Message-ID: <D0634C4264E4400492C9424041D7AF02@PhilipOakley> (raw)
In-Reply-To: alpine.DEB.2.21.1.1708231639470.19382@virtualbox

From: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
<snip>

>> So the problem seems to be that rebase -i (like rebase without -i)
>> considers "empty commits" as commits to be ignored. However, when using
>> rebase -i one expects that you can include the empty commit...
>>
>> Also, the behavior is odd. When I only have empty commits, a "git rebase
>> master" works as expected like a "git reset --hard master" but "git
>> rebase -i" does nothing.
>>
>> The expected behavior would be that the editor shows up with a
>> git-rebase-todo like:
>> # pick 3d0f6c49 empty commit
>> # pick bbbc5941 another empty commit
>> noop
>
> These days, I reflexively type `rebase -ki` instead of `rebase -i`. Maybe
> you want to do that, too?
>
> Ciao,
> Dscho

Is the -k option actually documented? I couldn't see it in the man pages. 
I'm guessing it's the same as `--keep-empty`.
--
Philip 


  parent reply	other threads:[~2017-08-23 22:42 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
2017-08-23 18:29           ` Junio C Hamano
2017-08-23 22:42     ` Philip Oakley [this message]
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=D0634C4264E4400492C9424041D7AF02@PhilipOakley \
    --to=philipoakley@iee.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=s-beyer@gmx.net \
    /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.