Re: What's cooking in git.git (topics)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 13, 2010, 20:46 UTC
- Message-ID
- <7vbp4pz9hf.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <loom.20101213T194818-377@post.gmane.org>
Yaroslav Halchenko <debian@onerussian.com> writes:
Show 5 quoted lines
> git checkout dfsg > git merge --no-commit -s theirs 0.2 > # after all I do not, and must not have my modifications > git rm -rf non-free-1 ... # probably would be scripted > git commit
The other day I was talking with Shawn Pearce and said that "-s theirs" would make sense only if used with --no-commit.
But for such a use case, "git read-tree -m -u 0.2" would work just as well, and discussion ended there ;-)