Git tips: Difference between revisions

From OLPC
Jump to navigation Jump to search
mNo edit summary
Line 43: Line 43:


== More Info about git ==
== More Info about git ==
*The general git user manual can be found here: [[http://www.kernel.org/pub/software/scm/git/docs/user-manual.html git user-manual]]
*[http://www.kernel.org/pub/software/scm/git/docs/user-manual.html git user-manual]
*[[git]]
*[[git]]
* Some (generic, not all applicable to OLPC/Sugar Labs' git trees) git workflow info: [http://kerneltrap.org/Linux/Git_Management Linus' recommendation]
* Some (generic, not all applicable to OLPC/Sugar Labs' git trees) git workflow info: [http://kerneltrap.org/Linux/Git_Management Linus' recommendation]

Revision as of 07:04, 5 June 2014

Working on branches

Create a remote branch

git clone git+ssh://dev.laptop.org/git/sugar
cd sugar
git branch update-1
git push origin update-1

Work on a remote branch

git clone git+ssh://dev.laptop.org/git/sugar
git checkout --track -b update-1 origin/update-1
git pull

You can now use commit, push and pull as usual.

Apply changes from master

git-cherry-pick <commit-id>
git push

Reverting changes

When you mess up a file and want it back to what it was, cd into the directory and:

git checkout HEAD -- gridwidget.py

To remove uncommitted changes and reset the project to HEAD:

get reset --hard HEAD

When you want an activity that sugar-jhbuild does not bring down

Read only:

git-clone git://dev.laptop.org/projects/tamtam

If you have commit access:

git-clone git+ssh://dev.laptop.org/git/projects/tamtam

More Info about git