Re: What's cooking in git.git (topics)
- From
Yaroslav Halchenko <debian@onerussian.com>
- Date
- Dec 14, 2010, 14:21 UTC
- Message-ID
- <20101214142155.GM13447@onerussian.com>
- In-Reply-To
- <4D071B60.2040906@viscovery.net>
On Tue, 14 Dec 2010, Johannes Sixt wrote:
Show 7 quoted lines
> > 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