[boost] merging the super-project

Subject: [boost] merging the super-project
From: Eric Niebler (eniebler_at_[hidden])
Date: 2014-07-16 12:32:13

I recently made a tweak to the .gitignore of the super-project on the
develop branch. How do I merge that to master? The two branches have
different histories, so a regular git merge balks. And when I checkout
master (thinking I'll just cherry-pick), I end up with a slew of local
changes (which I haven't made).

Befuddled,
Eric