Git tips: Difference between revisions

From OLPC
Jump to navigation Jump to search
No edit summary
No edit summary
Line 16: Line 16:
merge = refs/heads/trial-2
merge = refs/heads/trial-2


Then checkout as a local branch:
Then checkout the branch and pull:


git checkout -b trial-2
git checkout -b trial-2
git pull


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

Revision as of 12:42, 26 July 2007

Create a remote branch

git clone git+ssh://dev.laptop.org/git/sugar
git branch trial-2
git push origin trial-2

Work on a remote branch

git clone git+ssh://dev.laptop.org/git/sugar
git checkout -b trial-2

Add the following to .git/config

[branch "trial-2"]
    remote = origin
    merge = refs/heads/trial-2

Then checkout the branch and pull:

git checkout -b trial-2
git pull

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