More than 5 years have passed since last update.

別のリポジトリのコミット履歴を取り込む

Posted at 2014-06-24

あるgitリポジトリの特定のディレクトリに別のgitリポジトリのコミット履歴をそのままとりこみたいときのやり方

git remote add -f Bproject /path/to/B
git merge -s ours --no-commit Bproject/master
git read-tree --prefix=dir-B/ -u Bproject/master
git commit -m "Merge B project as our subdirectory"
git pull -s subtree Bproject master # なくてもいい

You get articles that match your needs
You can efficiently read back useful information
You can use dark theme

What you can do with signing up