Exclude a directory while merging

[Vlad Didenko <vdidenko@Getcollc.com>]

Colleagues,

Is there an easy way to exclude a directory from a merge operation.
Specifically:

We have a "master" branch. We also have an "other" branch. There is a
directory XYZ in the other branch which is not in the master. I need to
merge everything but XYZ into master. Something like that:

git checkout master
git merge other --exclude XYZ

Is that possible?

Thank you!
Vlad


This e-mail and its attachments are intended only for the individual or entity to whom it is addressed and may contain information that is confidential, privileged, inside information, or subject to other restrictions on use or disclosure. Any unauthorized use, dissemination or copying of this transmission or the information in it is prohibited and may be unlawful. If you have received this transmission in error, please notify the sender immediately by return e-mail, and permanently delete or destroy this e-mail, any attachments, and all copies (digital or paper). Unless expressly stated in this e-mail, nothing in this message should be construed as a digital or electronic signature.