2

The recommended approach for merging notes ref is

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

I tried this approach and it doesnt help to maintain a linear history. Below is the log which i got after performing the above steps.

*   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'

So my question is, is this the right approach of performing git notes merge. Please help out asap. Thanks.

4

0 回答 0