All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Eugene Sajine <euguess@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Proper way to abort incorrect cherry-picking?
Date: Wed, 28 Apr 2010 14:50:01 -0500	[thread overview]
Message-ID: <20100428195001.GA2242@progeny.tock> (raw)
In-Reply-To: <s2m76c5b8581004281238jf7179fffna7d757fee6ab4f10@mail.gmail.com>

Eugene Sajine wrote:

> the automatic cherry-pick failed and caused conflicts, so in
> order to to cancel the whole operation i had to do the following:
> 
> 1. mark the conflicting files as resolved (without even resolving
> them) by doing git add.
> 2. unstage all files staged for commit as a result of incomplete cherry picking
> 3. manually checkout touched files to their correct state (git checkout file)
> 
> and then i was able to repeat cherry-picking with correct commits.
> 
> Is there a better way?

git reset --merge

Ideas for where this should be put in the git-cherry-pick.txt manual?

Thanks,
Jonathan

  parent reply	other threads:[~2010-04-28 19:50 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-28 19:38 Proper way to abort incorrect cherry-picking? Eugene Sajine
2010-04-28 19:49 ` David Borowitz
2010-04-28 19:59   ` Eugene Sajine
2010-04-28 22:39     ` Jon Seymour
2010-04-28 23:37       ` Jonathan Nieder
2010-04-29  0:07         ` Jon Seymour
2010-04-29 19:11         ` git cherry(pick) dumps core Andreas Krey
2010-04-29 19:49           ` Jonathan Nieder
2010-04-29 20:21             ` Andreas Krey
2010-04-30 13:32               ` Jonathan Nieder
2010-05-08 23:17                 ` [PATCH] cherry-pick: do not dump core when iconv fails Jonathan Nieder
2010-05-08 23:55                   ` Junio C Hamano
2010-04-28 19:50 ` Jonathan Nieder [this message]
2010-04-28 20:05   ` Proper way to abort incorrect cherry-picking? Eugene Sajine

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=20100428195001.GA2242@progeny.tock \
    --to=jrnieder@gmail.com \
    --cc=euguess@gmail.com \
    --cc=git@vger.kernel.org \
    /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.