Adam Spiers (aspi...@suse.com) wrote: > You can also see from the git-icing comments that blacklisting of > commits which should never be upstreamed is now supported, e.g. > > git notes --ref=upstreaming add -m'skip: all' $sha > > Sharing git notes across repositories isn't the most convenient thing > in the world, but it shouldn't be hard. I think we can push notes > via: > > git push crowbar 'refs/notes/*:refs/notes/*' > > and then pull / merge via: > > http://vmiklos.hu/blog/git-notes-merge.html > > but I'm still trying to wrap my head around that bit.
I figured it out and documented it here: http://stackoverflow.com/questions/12055303/merging-git-notes-when-there-are-merge-conflicts-in-them/ _______________________________________________ Crowbar mailing list Crowbar@dell.com https://lists.us.dell.com/mailman/listinfo/crowbar For more information: http://crowbar.github.com/
