git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Git List <git@vger.kernel.org>,
	Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
	Daniel Barkalow <barkalow@iabervon.org>,
	Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [RFC PATCH v2] revert: Implement --abort processing
Date: Mon, 13 Jun 2011 20:25:03 +0530	[thread overview]
Message-ID: <BANLkTim2SOAp3=g_zie-oi2=A9X7NVd5qw@mail.gmail.com> (raw)
In-Reply-To: <20110612221217.GA2789@elie>

Hi again,

Jonathan Nieder writes:
> I don't think that should stop you from thinking about how new
> facilities help or interfere with work at all.  You use magit, right?
> It automates all kinds of things.  And while each person is going to
> use tools in different ways, that hasn't kept people from getting
> things done in the past.

I use Magit only for staging, unstaging, committing, amending, and
reverting portions.

> If you are thinking "I would never use 'git cherry-pick --abort' --- I
> would just look in the reflog for a commit to 'reset --hard' to", then
> you are *done*.  Just document it, make sure the reflog has useful
> content to help out, and wait until someone complains and adds a
> shortcut they like.

Ah, thanks for the helpful advice. I'll stay away from deciding
end-user interfaces altogether, and just write in the infrastructure
for sequencing commits with a minimalistic UI. People can add more
later :)

> As a side note, I'm curious about
> why you end up needing to remove the CHERRY_PICK_HEAD.  Is "git commit
> -c interesting-patch" misbehaving somehow?  (It should ignore the
> CHERRY_PICK_HEAD entirely.)

Sorry, I should have been clearer.  I remove the CHERRY_PICK_HEAD to
avoid hitting "commit", "commit --amend" by mistake.  With "git commit
-c", it displays a pleasant message:

# It looks like you may be committing a cherry-pick.
# If this is not correct, please remove the file
#	.git/CHERRY_PICK_HEAD
# and try again.

-- Ram

  reply	other threads:[~2011-06-13 14:55 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-11  6:36 [RFC PATCH v2] revert: Implement --abort processing Ramkumar Ramachandra
2011-06-11 11:22 ` Jonathan Nieder
2011-06-12 12:09   ` Ramkumar Ramachandra
2011-06-12 12:21     ` Jonathan Nieder
2011-06-12 12:51       ` Ramkumar Ramachandra
2011-06-12 22:12         ` Jonathan Nieder
2011-06-13 14:55           ` Ramkumar Ramachandra [this message]
2011-06-13 20:28             ` Jonathan Nieder

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='BANLkTim2SOAp3=g_zie-oi2=A9X7NVd5qw@mail.gmail.com' \
    --to=artagnon@gmail.com \
    --cc=barkalow@iabervon.org \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.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 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).