EBC Exercise 16 git - Revision history

Yoder: /* Extra Notes */ Removed

2013-05-02T01:22:36Z

‎Extra Notes: Removed

2012-09-06T13:40:14Z

‎2. Git Basics: Removed reference to my repository

2012-09-06T06:00:29Z

‎Access ti/staging

2012-09-05T17:05:28Z

‎0. Set Up Git: Added host git install instructions

2012-09-03T14:09:04Z

‎Merging helloWorld.c

2012-07-17T19:28:55Z

2012-05-28T16:49:50Z

‎Merging helloWorld.c

2012-05-28T16:39:32Z

Added Header/Footer

2012-01-18T00:05:04Z

‎Access ti/staging: Updated formatting

2012-01-18T00:02:19Z

‎Merging helloBeagle.c

← Older revision		Revision as of 01:22, 2 May 2013
Line 104:		Line 104:

	[http://yehudakatz.com/2010/05/13/common-git-workflows/ Here's] a nice article on a common git workflow for those who are moving from svn.		[http://yehudakatz.com/2010/05/13/common-git-workflows/ Here's] a nice article on a common git workflow for those who are moving from svn.
−
−	~~== Extra Notes ==~~
−
−	~~The following are extra notes I may clean up later.~~

	== Access ti/staging ==		== Access ti/staging ==

@@ Line 58: / Line 58: @@
 </pre>
-There is lots of good material here.  I suggest you work through it all.  Section 2.1 shows how to clone a remote repository.  Try using my repository.
+There is lots of good material here.  I suggest you work through it all.  Section 2.1 shows how to clone a remote repository.
-<pre>
-git clone git@github.com:MarkAYoder/gitLearn.git
-</pre>
 '''gitk''' looks like a nice tool.  Be sure to take a look at it.

@@ Line 121: / Line 121: @@
   host$ '''cd ${OETREE}'''
   host$ '''wget http://download.berlios.de/bitbake/bitbake-1.8.18.tar.gz'''
-  host$ '''tar -xvf bitbake-1.8.18.tar.g'''
+  host$ '''tar -xvf bitbake-1.8.18.tar.gz'''
   host$ '''gedit source-me.txt'''

@@ Line 18: / Line 18: @@
 The last opkg installs <code>ssh-keygen</code> which is needed to work with github.
-On my host computer I had to run
+On the host
   host$ '''ssh-add id_rsa'''

@@ Line 93: / Line 93: @@
 * Edit <code>helloWorld.c</code> and add a <code>printf</code> with your name on it.
 * stage and commit <code>helloWorld.c</code>.  You may have to merge.  Keep everyone else's name in the file.
 * Push it to the repository.

@@ Line 85: / Line 85: @@
 I'll work through 3.1 in class.  Read through 3.2 and then do the following exercise.
-=== Merging helloBeagle.c ===
+=== Merging helloWorld.c ===
 * clone my repository (The pass phrase is ''Hiapp'')
@@ Line 92: / Line 92: @@
   beagle$ '''cd gitLearn'''
-* Edit <code>helloBeagle.c</code> and add a <code>printf</code> with your name on it.
+* Edit <code>helloWorld.c</code> and add a <code>printf</code> with your name on it.
-* stage and commit <code>helloBeagle.c</code>.  You may have to merge.  Keep everyone else's name in the file.
+* stage and commit <code>helloWorld.c</code>.  You may have to merge.  Keep everyone else's name in the file.
 * Push it to the repository.

@@ Line 1: / Line 1: @@
 [[Category:ECE497]]
 '''[[git]]''' is a distributed revision control system with an emphasis on being fast. It was initially designed and developed by Linus Torvalds for Linux kernel development.  The purpose of this lab is to get hands on experience with git to learn how it works and how to use it.
@@ Line 132: / Line 133: @@
   host$ '''mv angstrom-dev angstrom-dev.v0'''
   host$ '''bitbake console-image'''

@@ Line 109: / Line 109: @@
 Here is what I did to access the ti/staging stuff.
-<pre>
+ host$ '''cd ~/oe/openembedded'''
-host $ cd ~/oe/openembedded
+ host$ '''git remote add gitor git://gitorious.org/angstrom/openembedded.git'''
-host $ git remote add gitor git://gitorious.org/angstrom/openembedded.git
+ host$ '''git fetch gitor'''
-host $ git fetch gitor
+ host$ '''git checkout gitor/ti/staging -b ti/staging'''
-host $ git checkout gitor/ti/staging -b ti/staging
+ host$ '''cd ${OETREE}'''
-host $ cd ${OETREE}
+ host$ '''wget http://download.berlios.de/bitbake/bitbake-1.8.18.tar.gz'''
-host $ wget http://download.berlios.de/bitbake/bitbake-1.8.18.tar.gz
+ host$ '''tar -xvf bitbake-1.8.18.tar.g'''
-host $ tar -xvf bitbake-1.8.18.tar.g
+ host$ '''gedit source-me.txt'''
 host $ gedit source-me.txt
-</pre>
 Change
-<pre>
-PATH=${OETREE}/openembedded/bitbake/bin:${ORG_PATH}
+ PATH=${OETREE}/openembedded/bitbake/bin:${ORG_PATH}
-</pre>
 to
-<pre>
-PATH=${OETREE}/bitbake-1.8.18/bin:${ORG_PATH}
+ PATH=${OETREE}/bitbake-1.8.18/bin:${ORG_PATH}
-</pre>
 Save and quit gedit
-<pre>
-host $ . source-me.txt
+ host$ '''. source-me.txt'''
-host $ cd ~/oe
+ host$ '''cd ~/oe'''
-host $ mv angstrom-dev angstrom-dev.v0
+ host$ '''mv angstrom-dev angstrom-dev.v0'''
-host $ bitbake console-image
+ host$ '''bitbake console-image'''
-</pre>