All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: Heads up: major rebase -i -p rework coming up
Date: Sun, 25 Jan 2009 14:46:02 +0100	[thread overview]
Message-ID: <glhqdi$tec$1@ger.gmane.org> (raw)
In-Reply-To: alpine.DEB.1.00.0901250324320.14855@racer

Johannes Schindelin wrote:

>> Hmm.  You're right, that is not really intuitive.  How about
>> 
>>       merge (B) A # Merge...
>> 
>> instead?
> 
> Or even better:
> 
>         merge B parent A' # Merge...

merge B with A' # Merge... 

;-)

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

  reply	other threads:[~2009-01-25 13:47 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-24 20:25 Heads up: major rebase -i -p rework coming up Johannes Schindelin
2009-01-24 20:37 ` Junio C Hamano
2009-01-24 21:04   ` Johannes Schindelin
2009-01-24 21:09     ` Johannes Schindelin
2009-01-24 23:01     ` Junio C Hamano
2009-01-25  2:23       ` Johannes Schindelin
2009-01-26 16:21     ` Marc Branchaud
2009-01-24 22:47 ` Thomas Rast
2009-01-25  2:05   ` Johannes Schindelin
2009-01-25  2:25     ` Johannes Schindelin
2009-01-25 13:46       ` Jakub Narebski [this message]
2009-01-25 14:17         ` Johannes Schindelin
2009-01-25 15:07           ` Sverre Rabbelier
2009-01-25 15:24             ` Johannes Schindelin
2009-01-25 20:35               ` Junio C Hamano
2009-01-25 20:59                 ` Johannes Schindelin
2009-01-25 22:03                 ` Jakub Narebski
2009-01-25 23:29                   ` Johannes Schindelin
2009-02-03 10:05                     ` Nanako Shiraishi
2009-02-03 11:47                       ` Johannes Schindelin
2009-01-25 16:22           ` Jakub Narebski
2009-01-25 17:18             ` Björn Steinbrink
2009-01-26 16:10 ` Marc Branchaud
2009-01-27 15:21 ` Stephen Haberman
2009-01-27 18:08   ` Johannes Schindelin
2009-01-27 22:10   ` Nanako Shiraishi
2009-01-27 22:36     ` Stephen Haberman

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='glhqdi$tec$1@ger.gmane.org' \
    --to=jnareb@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.