From: Jeff King <peff@peff.net>
To: Jay Soffian <jaysoffian@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC/PATCH] mergetool: clarify local/remote terminology
Date: Mon, 25 Feb 2008 13:46:48 -0500 [thread overview]
Message-ID: <20080225184648.GC15131@sigill.intra.peff.net> (raw)
In-Reply-To: <76718490802250631p262baf1bw23873e5fdbbb7180@mail.gmail.com>
On Mon, Feb 25, 2008 at 09:31:03AM -0500, Jay Soffian wrote:
> Anyone?
>
> On Thu, Feb 21, 2008 at 12:12 AM, Jay Soffian <jaysoffian@gmail.com> wrote:
> > Always calling the thing on the left-side of a merge "local" and on the
> > right side "remote" isn't correct. You could be rebasing, in which case
> > the left side is the new base/upstream and the right side is the saved
> > commits which are being re-applied. So,
I have been annoyed by this in the past, too. And I think your change is
probably an improvement (though I haven't tried it yet). As a user, what
I would _really_ like to see, though, is simply the branch names:
"origin/next" versus "next". I looked at using the GITHEAD_* mechanism
in the past, but that relies on the environment, which can't get
directly to mergetool. See this thread:
http://mid.gmane.org/20070820075318.GA12478@coredump.intra.peff.net
I think the right thing to do is the oft-discussed-but-never-implemented
"what's happening right now" file/command that would say:
1. there's a rebase happening now
2. the upstream branch is X
3. the rebased branch is Y
but that could also of course say
1. there's a merge happening now
2. the first parent is X
3. the second parent is Y
and so on (including "we're in a git-am, git-cherry-pick, etc").
I'll try out your patch and comment next time I use it.
-Peff
next prev parent reply other threads:[~2008-02-25 18:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-21 5:12 [RFC/PATCH] mergetool: clarify local/remote terminology Jay Soffian
2008-02-25 14:31 ` Jay Soffian
2008-02-25 18:46 ` Jeff King [this message]
2008-02-25 19:07 ` Jay Soffian
2008-02-25 19:21 ` Jeff King
2008-02-25 20:09 ` Jay Soffian
2008-02-25 20:11 ` Jeff King
2008-02-28 8:43 ` Jeff King
2008-02-29 5:47 ` Junio C Hamano
2008-03-01 4:41 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080225184648.GC15131@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=jaysoffian@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).