From: Junio C Hamano <gitster@pobox.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Stephen Kelly <steveire@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH/RFC 2/2] git rebase -i: Warn removed or dupplicated commits
Date: Wed, 27 May 2015 12:20:05 -0700 [thread overview]
Message-ID: <xmqqwpztltei.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <vpqy4ka5jyp.fsf@anie.imag.fr> (Matthieu Moy's message of "Wed, 27 May 2015 13:38:22 +0200")
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> Stephen Kelly <steveire@gmail.com> writes:
>
>> Galan Rémi <remi.galan-alfonso <at> ensimag.grenoble-inp.fr> writes:
>>
>>>
>>> Check if commits were removed (i.e. a line was deleted) or dupplicated
>>> (e.g. the same commit is picked twice), can print warnings or abort
>>> git rebase according to the value of the configuration variable
>>> rebase.checkLevel.
>>
>> I sometimes duplicate commits deliberately if I want to split a commit in
>> two. I move a copy up and fix the conflict, and I know that I'll still get
>> the right thing later even if I make a mistake with the conflict
>> resolution.
>
> The more I think about it, the more I think we should either not warn at
> all on duplicate commits, or have a separate config variable.
Yeah, I'd say we shouldn't warn, without configuration to keep
things simple.
>
> It's rare to duplicate by mistake, and when you do so, it's already easy
> to notice: you get conflicts, and you can git rebase --skip the second
> occurence. Accidentally dropped commits are another story: it's rather
> easy to cut-and-forget-to-paste, and the consequence currently is silent
> data loss ...
next prev parent reply other threads:[~2015-05-27 19:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-26 21:38 [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit Galan Rémi
2015-05-26 21:38 ` [PATCH/RFC 2/2] git rebase -i: Warn removed or dupplicated commits Galan Rémi
2015-05-26 23:27 ` Eric Sunshine
2015-05-27 13:19 ` Remi Galan Alfonso
2015-05-27 17:41 ` Eric Sunshine
2015-05-27 19:18 ` Junio C Hamano
2015-05-28 7:44 ` Remi Galan Alfonso
2015-05-28 16:53 ` Junio C Hamano
2015-05-27 13:23 ` Remi Galan Alfonso
2015-05-27 8:54 ` Stephen Kelly
2015-05-27 11:38 ` Matthieu Moy
2015-05-27 19:20 ` Junio C Hamano [this message]
2015-05-26 22:52 ` [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit Eric Sunshine
2015-05-27 6:28 ` Johannes Schindelin
2015-05-27 14:53 ` Remi Galan Alfonso
2015-05-27 15:04 ` Matthieu Moy
2015-05-27 19:21 ` Junio C Hamano
2015-05-27 19:44 ` Matthieu Moy
2015-05-27 20:35 ` Junio C Hamano
2015-05-27 21:47 ` Stefan Beller
2015-05-28 17:06 ` Johannes Schindelin
2015-05-28 17:12 ` Stefan Beller
2015-05-28 17:45 ` Matthieu Moy
2015-05-27 23:42 ` Philip Oakley
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=xmqqwpztltei.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=steveire@gmail.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.