Re: theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy

From: Jeff King <peff@peff.net>
Date: Jul 28, 2008, 18:56 UTC
Message-ID: <20080728185604.GA26322@sigill.intra.peff.net>
In-Reply-To: <bd6139dc0807280754x76b6ffedg6bf756dfce23f1e3@mail.gmail.com>

On Mon, Jul 28, 2008 at 04:54:17PM +0200, Sverre Rabbelier wrote:

Show 11 quoted lines

> Thus resulting in a 'wrong way around' merge as part of master? It
> would say "Merge branch 'master' into otherbranch", while what
> happened was "Merge branch 'otherbranch' into master".
> 
> So, in short: what does the list think about adding
> "git-merge-theirs", that does (although possibly less 'hackish'):
> 
> cat > git-merge-theirs << EOF
> #!/bin/sh
> eval git read-tree --reset -u \\\$\$#
> EOF

I ran into this exact situation while showing somebody how awesome git was, and it was a little embarrasing to say "oops, now we have to do this backwards."

So I think it would be nice for completeness, although I admit that my situation was rare (but no rarer, perhaps, than "-s ours").

-Peff

PS You may find your shell snippet a bit more readable by quoting 'EOF'.