From: Sergei Organov <osv@javad•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx•de>, git@vger•kernel.org
Subject: Re: Newbie: report of first experience with git-rebase.
Date: Thu, 01 Nov 2007 15:13:32 +0300 [thread overview]
Message-ID: <87ve8m2mfn.fsf@osv.gnss.ru> (raw)
In-Reply-To: <7vhck7gdzs.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Wed\, 31 Oct 2007 14\:39\:51 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> Johannes Schindelin <Johannes.Schindelin@gmx•de> writes:
>
>> On Wed, 31 Oct 2007, Sergei Organov wrote:
>>
>>> Yes, and that's the problem. Why 'git --continue' didn't just skip this
>>> patch that *already became no-op* after conflict resolution and forced
>>> me to explicitly use 'git --skip' instead?
>>
>> Isn't that obvious? To prevent you from accidentally losing a commit.
>
> In case it is not obvious...
>
> A rebase conflict resolution that results in emptiness is a
> rather rare event (especially because rebase drops upfront the
> identical changes from the set of commits to be replayed), but
> it does happen.
Funny how 2 of my first 3 commits suffer from this "rather rare event",
and it was not Friday, 13 ;)
--
Sergei.
next prev parent reply other threads:[~2007-11-01 12:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-31 19:39 Newbie: report of first experience with git-rebase Sergei Organov
2007-10-31 19:57 ` Björn Steinbrink
2007-10-31 20:28 ` Sergei Organov
2007-10-31 21:12 ` Johannes Schindelin
2007-10-31 21:29 ` J. Bruce Fields
2007-10-31 22:06 ` Steven Grimm
2007-10-31 22:35 ` Daniel Barkalow
2007-10-31 22:38 ` J. Bruce Fields
2007-10-31 21:39 ` Junio C Hamano
2007-10-31 22:53 ` David Kastrup
2007-11-01 2:27 ` Nicolas Pitre
2007-11-01 12:13 ` Sergei Organov [this message]
2007-11-01 14:24 ` Johannes Schindelin
2007-11-01 15:10 ` J. Bruce Fields
2007-11-01 20:20 ` Junio C Hamano
2007-11-02 10:13 ` Andreas Ericsson
2007-11-02 19:11 ` Junio C Hamano
[not found] ` <472B77AC.5080507@midwinter.com>
2007-11-02 19:22 ` Andreas Ericsson
2007-10-31 22:49 ` David Kastrup
2007-10-31 21:25 ` Alex Riesen
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=87ve8m2mfn.fsf@osv.gnss.ru \
--to=osv@javad$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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