On Mon, Jul 28, 2008 at 04:54:17PM +0200, Sverre Rabbelier <alturin@xxxxxxxxx> wrote: > 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.
Attachment:
pgp536pDbXsKl.pgp
Description: PGP signature
