Re: theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy
- From
Miklos Vajna <vmiklos@frugalware.org>
- Date
- Jul 28, 2008, 18:14 UTC
- Message-ID
- <20080728181424.GM32057@genesis.frugalware.org>
- In-Reply-To
- <bd6139dc0807280754x76b6ffedg6bf756dfce23f1e3@mail.gmail.com>
On Mon, Jul 28, 2008 at 04:54:17PM +0200, Sverre Rabbelier <alturin@gmail.com> wrote:
Show 7 quoted lines
> 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
Isn't this the stupid one?
It's perfect for my testing needs, but this is not something that people should ever use on a real repo.