I have two repos: Market and Android. When I merge Android to Market use these steps:
cd market
git remote add android ../android
git fetch android
git merge --allow-unrelated-histories android/master
But I get this error:
ei@localhost:~/market$ git merge --allow-unrelated-histories
android/master error: unknown option `allow-unrelated-histories'
My enviroment: Ubuntu LTS 14.04
ei@localhost:~/market$ git --version
git version 1.9.1
Is this option removed from Git merge, or do I need some extra config?
Any help would be appreciated, thanks!
Question&Answers:
os 与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…