From: Enrico Weigelt <weigelt@metux.de>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Testing for a merge conflict without a working copy
Date: Tue, 21 Sep 2010 17:02:17 +0200 [thread overview]
Message-ID: <20100921150217.GB14711@nibiru.local> (raw)
In-Reply-To: <4C98C4FC.1080904@workspacewhiz.com>
* Joshua Jensen <jjensen@workspacewhiz.com> wrote:
> If I simply want to determine whether a merge would conflict, is there
> a way to do it without a working copy?
hmm, you could do it in an temporary working copy (see --work-dir).
cu
--
----------------------------------------------------------------------
Enrico Weigelt, metux IT service -- http://www.metux.de/
phone: +49 36207 519931 email: weigelt@metux.de
mobile: +49 151 27565287 icq: 210169427 skype: nekrad666
----------------------------------------------------------------------
Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme
----------------------------------------------------------------------
prev parent reply other threads:[~2010-09-24 10:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-21 14:45 Testing for a merge conflict without a working copy Joshua Jensen
2010-09-21 15:02 ` Enrico Weigelt [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=20100921150217.GB14711@nibiru.local \
--to=weigelt@metux.de \
--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 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).