BA / SerialCom

Fork of OmniWheels by Gustav Atmel

Committer:
gustavatmel
Date:
Tue May 01 15:47:08 2018 +0000
Revision:
1:9c5af431a1f1
sdf

Who changed what in which revision?

UserRevisionLine numberNew contents of line
gustavatmel 1:9c5af431a1f1 1 This directory is used as a git subtree. The master copy is at
gustavatmel 1:9c5af431a1f1 2
gustavatmel 1:9c5af431a1f1 3 https://github.com/ARMmbed/nanomesh-applications/tree/nvm
gustavatmel 1:9c5af431a1f1 4
gustavatmel 1:9c5af431a1f1 5 (ie the nvm branch of that repository).
gustavatmel 1:9c5af431a1f1 6
gustavatmel 1:9c5af431a1f1 7 If you are seeing this as a subdirectory of another repository,
gustavatmel 1:9c5af431a1f1 8 or in Platforms/common/nvm of the same repository, it has been
gustavatmel 1:9c5af431a1f1 9 pulled in via git subtree.
gustavatmel 1:9c5af431a1f1 10
gustavatmel 1:9c5af431a1f1 11 You should not normally edit files in this directory unless you are
gustavatmel 1:9c5af431a1f1 12 working on the nvm branch in a clone of the master repository.
gustavatmel 1:9c5af431a1f1 13
gustavatmel 1:9c5af431a1f1 14 Changes to the nvm code would be done as follows:
gustavatmel 1:9c5af431a1f1 15
gustavatmel 1:9c5af431a1f1 16 # nvm branch is the "master" for the code
gustavatmel 1:9c5af431a1f1 17 git checkout nvm
gustavatmel 1:9c5af431a1f1 18
gustavatmel 1:9c5af431a1f1 19 # make and commit changes
gustavatmel 1:9c5af431a1f1 20 git checkout master
gustavatmel 1:9c5af431a1f1 21 git subtree merge -P Platforms/common/nvm nvm
gustavatmel 1:9c5af431a1f1 22
gustavatmel 1:9c5af431a1f1 23 To take the latest version of the nvm reference code into another
gustavatmel 1:9c5af431a1f1 24 repository already containing it as a subtree, use the command:
gustavatmel 1:9c5af431a1f1 25
gustavatmel 1:9c5af431a1f1 26 git subtree pull -P our/path/to/nvm \
gustavatmel 1:9c5af431a1f1 27 git@github.com:ARMmbed/nanomesh-applications nvm
gustavatmel 1:9c5af431a1f1 28
gustavatmel 1:9c5af431a1f1 29 To take this code into use as a subtree for the first time,
gustavatmel 1:9c5af431a1f1 30 use the command:
gustavatmel 1:9c5af431a1f1 31
gustavatmel 1:9c5af431a1f1 32 git subtree add -P our/path/to/nvm \
gustavatmel 1:9c5af431a1f1 33 git@github.com:ARMmbed/nanomesh-applications nvm
gustavatmel 1:9c5af431a1f1 34
gustavatmel 1:9c5af431a1f1 35 See 'git help subtree' for more information.
gustavatmel 1:9c5af431a1f1 36