On 27/03/13 18:06, Jed Brown wrote:
Charlie Smurthwaite <char...@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!

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to