Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Next revision Both sides next revision
en:git:git-subtree [2011/12/27 03:48]
alex created
en:git:git-subtree [2011/12/27 03:57]
alex
Line 79: Line 79:
 <​code>​ <​code>​
 git fetch zbt git fetch zbt
-git subtree merge -P zigbee-terminal -m "​merged changes in ZigBee Terminal" zbt/master+git subtree merge -P zigbee-terminal -m "​merged changes in zigbee-terminal" zbt/master
 </​code>​ </​code>​
  
 Slick. ​ Now that that's taken care of, time to get back to the real engineering... Slick. ​ Now that that's taken care of, time to get back to the real engineering...