合并笔记ref的推荐方法是
git checkout refs/notes/commits
git fetch origin refs/notes/commits:refs/notes/origin/commits
git notes merge -v origin/commits
git notes merge --commit
我尝试了这种方法,它没有帮助维持线性历史记录。下面是执行上述步骤后得到的日志。
* 857410f Merged notes from refs/notes/origin/commits into refs/notes/commits
|\
| * 1d6ff9e Merged notes from refs/notes/origin/commits into refs/notes/commits
| |\
| | * 18dec97 Notes added by 'git notes add'
| | * 2b7cfae Notes added by 'git notes add'
| | * 9e5e223 Notes added by 'git notes add'
| * 49ae944 Notes added by 'git notes add'
* 8f5fd8a Notes added by 'git notes add'
所以我的问题是,这是执行git notes merge的正确方法。请尽快帮忙。感谢。