From: Charlie Smurthwaite <charlie@atechmedia.com>
To: Jed Brown <jed@59A2.org>
Cc: Junio C Hamano <gitster@pobox.com>, <git@vger.kernel.org>,
John Keeping <john@keeping.me.uk>,
Thomas Rast <trast@inf.ethz.ch>
Subject: Re: Segfault with merge-tree on multiple Git versions
Date: Wed, 27 Mar 2013 18:46:37 +0000 [thread overview]
Message-ID: <51533E8D.5050206@atechmedia.com> (raw)
In-Reply-To: <874nfw4t0r.fsf@59A2.org>
On 27/03/13 18:06, Jed Brown wrote:
> Charlie Smurthwaite <charlie@atechmedia.com> writes:
>
>> I am also using this to obtain a diff that would be applied if a merge
>> were to be run. Is there a better way to obtain this information that is
>> more commonly used?
> You can do an actual merge using detached HEAD:
>
> $ git checkout --detach upstream-branch
> $ git merge topic-branch
>
> This has the benefit that if there are conflicts, you can resolve them
> here and commit the result so that rerere can auto-resolve them later.
>
> Are you looking for something that can be run in a bare repo?
Yes, I would need to be able to do this on a bare repo for my use case.
Thanks!
next prev parent reply other threads:[~2013-03-27 18:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-27 15:29 Segfault with merge-tree on multiple Git versions Charlie Smurthwaite
2013-03-27 15:53 ` thomas
2013-03-27 15:58 ` John Keeping
2013-03-27 16:05 ` Thomas Rast
2013-03-27 16:33 ` Junio C Hamano
2013-03-27 17:06 ` Junio C Hamano
2013-03-27 17:17 ` Charlie Smurthwaite
2013-03-27 17:52 ` Charlie Smurthwaite
2013-03-27 18:06 ` Jed Brown
2013-03-27 18:46 ` Charlie Smurthwaite [this message]
2013-03-27 19:16 ` Jed Brown
2013-03-27 19:45 ` John Keeping
2013-03-27 20:01 ` Jeff King
2013-03-27 21:10 ` Charlie Smurthwaite
2013-03-27 20:04 ` Junio C Hamano
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=51533E8D.5050206@atechmedia.com \
--to=charlie@atechmedia.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jed@59A2.org \
--cc=john@keeping.me.uk \
--cc=trast@inf.ethz.ch \
/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).