Daiki Kato / mbed-os-lychee

mbed-os for GR-LYCHEE

Dependents:   mbed-os-example-blinky-gr-lychee GR-Boads_Camera_sample GR-Boards_Audio_Recoder GR-Boads_Camera_DisplayApp ... more

features/FEATURE_COMMON_PAL/nanostack-hal-mbed-cmsis-rtos/nvm/README.md@0:f782d9c66c49, 2018-02-02 (annotated)

Committer:
dkato
Date:
Fri Feb 02 05:42:23 2018 +0000
Revision:
0:f782d9c66c49
mbed-os for GR-LYCHEE

Who changed what in which revision?

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