All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
	Andrew Wong <andrew.kw.w@gmail.com>,
	Git List <git@vger.kernel.org>
Subject: Re: [BUG?] rebase -i: edit versus unmerged changes
Date: Sat, 23 Mar 2013 22:13:15 -0700	[thread overview]
Message-ID: <7vhak14bys.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CALkWK0nspPEaA3BLjgV6Qv2UgXRbDft1d6SmRCiVNJoxpqLFwg@mail.gmail.com> (Ramkumar Ramachandra's message of "Sat, 23 Mar 2013 18:21:22 +0530")

Ramkumar Ramachandra <artagnon@gmail.com> writes:

> Junio C Hamano wrote:
>
>> FWIW, I am not convinced yet why we would even want "git continue"
>> in the first place, so I won't be the one who would be suggesting a
>> migration path.
>
> Okay, I'm confused now.  You were the one who suggested a unified "git
> continue" in the first place, if my memory serves me right.  Why are
> you doubting it now?

AFAIR, the only thing I said about "continue" was that in a more
rational future where many "git frotz" commands that can stop and
ask the user to help exist, after the user helps the command by
creating the desired outcome in the index, the way the user signals
that she is done helping would be "git frotz --continue", and the
"After helping 'git merge', conclude it with 'git commit'" would be
an odd-man-out, and adding 'git merge --continue' may not be a bad
idea to make things more consistent.  Originally the way to help
"am" (with or without "-3") was to say "am --resolved", but that has
long been fixed to also take "am --continue".

So if you are adding "git merge --continue", that would be fine by
me, but I never said "git continue" subcommand would make any sense
at all.

      reply	other threads:[~2013-03-24  5:13 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-19  9:37 [BUG?] rebase -i: edit versus unmerged changes Ramkumar Ramachandra
2013-03-19 14:21 ` Andrew Wong
2013-03-20 20:25   ` Ramkumar Ramachandra
2013-03-20 20:42     ` Jonathan Nieder
2013-03-20 20:45     ` Junio C Hamano
2013-03-22  8:23       ` Ramkumar Ramachandra
2013-03-22 18:25         ` Jonathan Nieder
2013-03-22 20:42           ` Junio C Hamano
2013-03-23 12:51             ` Ramkumar Ramachandra
2013-03-24  5:13               ` Junio C Hamano [this message]

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=7vhak14bys.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=andrew.kw.w@gmail.com \
    --cc=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@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.