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 15:11:02 -0500 [thread overview]
Message-ID: <20080225201102.GA21928@coredump.intra.peff.net> (raw)
In-Reply-To: <76718490802251209u240bc0b2s8e268c7f1943c3d9@mail.gmail.com>
On Mon, Feb 25, 2008 at 03:09:04PM -0500, Jay Soffian wrote:
> > Probably HEAD and HEAD~5 (perhaps along with their oneline logs). I
> > think the best we can do is "whatever the user said to get us here"
> > which is not something you can calculate after the fact; you have to
> > remember what the user said.
>
> Right, so the porcelain would have to save this information somewhere
> for mergetool to access (yes/no/maybe?).
Yes (that's what would go into a .git/status type of file).
> Anyway, that's why the first iteration of my patch takes --left
> and --right arguments so at least you can tell it how you got
> there.
Yes, I saw that. The problem is that git-mergetool is invoked by the
user. Is it really improving the usability to have to manually specify
--left and --right? Saving and restoring the state seems like the only
useful option.
-Peff
next prev parent reply other threads:[~2008-02-25 20:11 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
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 [this message]
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=20080225201102.GA21928@coredump.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).