On Tue, 14 Dec 2010, Johannes Sixt wrote:
> > hm -- read-tree sounded like yet another unknown to me feature of GIT I
> > was trying desperately to discover ;) unfortunately it doesn't produce a merge
> > for me :-/ -- just a simple commit with the state taken from the other tree:
> How about:
> git merge --no-commit -s ours 0.2
> git read-tree -m -u 0.2
> git commit -m "Reset to 0.2"
Thank you Johannes for chewing it up to ease the digestion by my
brainless stomach -- works just fine ;)
I guess this could be the alias for my needs:
mtheirs = !sh -c 'git merge -s ours --no-commit $1 && git read-tree -m -u "$1"' -
but since it might be a generic pattern for the use case(s) I have
stated I still see no objective reason why simple '-s theirs' should not
be there.
--
=------------------------------------------------------------------=
Keep in touch www.onerussian.com
Yaroslav Halchenko www.ohloh.net/accounts/yarikoptic
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html