From: Neal Kreitzinger <nkreitzinger@gmail.com>
To: Neil Horman <nhorman@tuxdriver.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: odd behavior with git-rebase
Date: Mon, 26 Mar 2012 16:53:02 -0500 [thread overview]
Message-ID: <4F70E53E.6060608@gmail.com> (raw)
In-Reply-To: <20120326172028.GB12843@hmsreliant.think-freely.org>
On 3/26/2012 12:20 PM, Neil Horman wrote:
> On Mon, Mar 26, 2012 at 10:12:48AM -0700, Junio C Hamano wrote:
>> Neil Horman<nhorman@tuxdriver.com> writes:
>>
>>> I agree, I think perhaps adding an --allow-empty option to the rebase logic, so
>>> that empty commits (or perhaps just initially empty, as opposed to commits made
>>> empty) would be very beneficial.
>>
>> Yeah, that probably may make sense.
>>
> Ok, cool, I'll have a patch in a few days, thanks!
>
IMO, it seems like --allow-empty is an appropriate patch for git-rebase
(non-interactive), and that git-rebase -i would need a command like
"k"eep to distinguish which empty commits are not to be discarded and
which empty commits are ok to discard automatically. git-rebase -i
should allow explicit control on a commit by commit basis as opposed to
blanket rules like "discard all empty commits" or "keep all empty
commits" that apply to all commits in the rebase-to-do list based on a
single cli option.
Maybe this is what you plan on doing. Maybe there is a better command
name than "k"eep for this.
v/r,
neal
next prev parent reply other threads:[~2012-03-26 21:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-23 18:52 odd behavior with git-rebase Neil Horman
2012-03-23 19:54 ` Jeff King
2012-03-26 18:31 ` Phil Hord
2012-03-26 19:56 ` Jeff King
2012-03-23 20:33 ` Junio C Hamano
2012-03-24 16:55 ` Neil Horman
2012-03-26 17:12 ` Junio C Hamano
2012-03-26 17:20 ` Neil Horman
2012-03-26 21:53 ` Neal Kreitzinger [this message]
2012-03-26 22:53 ` Phil Hord
[not found] ` <4F72AD25.2090102@gmail.com>
2012-03-28 6:58 ` Phil Hord
2012-03-28 17:08 ` Junio C Hamano
2012-03-26 18:29 ` Phil Hord
2012-03-26 20:04 ` Neil Horman
2012-03-27 1:58 ` Jay Soffian
2012-03-26 15:27 ` Neal Kreitzinger
2012-03-26 17:18 ` Neil Horman
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=4F70E53E.6060608@gmail.com \
--to=nkreitzinger@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nhorman@tuxdriver.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 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).