git-subrepo

冲突的解决

# 检出上游代码
git reset --hard refs/subrepo/<path>/path/fetch
# 对比过去所作的更改
commit=$(git config --file <path>/path/.gitrepo --get subrepo.commit)
git diff --stat $commit refs/subrepo/pack/general/start/neomake/branch