Skip to content

Instantly share code, notes, and snippets.

@aurelian
Created July 31, 2009 13:41
Show Gist options
  • Select an option

  • Save aurelian/159228 to your computer and use it in GitHub Desktop.

Select an option

Save aurelian/159228 to your computer and use it in GitHub Desktop.
finques /tmp $ git clone [email protected]:aurelian/slobo.git
Initialized empty Git repository in /tmp/slobo/.git/
remote: Counting objects: 6, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 6 (delta 0), reused 0 (delta 0)
Receiving objects: 100% (6/6), done.
finques /tmp $ cd slobo/
finques /tmp/slobo(master) $ git st
# On branch master
nothing to commit (working directory clean)
finques /tmp/slobo(master) $ git branch --track foo origin/remote_foo
Branch foo set up to track remote branch refs/remotes/origin/remote_foo.
finques /tmp/slobo(master) $ git branch --track bar origin/remote_bar
Branch bar set up to track remote branch refs/remotes/origin/remote_bar.
finques /tmp/slobo(master) $ git checkout foo
Switched to branch "foo"
finques /tmp/slobo(foo) $ git merge bar
Updating 78d8489..dd29eb3
Fast forward
a.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 a.txt
finques /tmp/slobo(foo) $ git st
# On branch foo
# Your branch is ahead of 'origin/remote_foo' by 1 commit.
#
nothing to commit (working directory clean)
finques /tmp/slobo(foo) $ git push
Everything up-to-date
finques /tmp/slobo(foo) $ git push origin origin/remote_foo
Total 0 (delta 0), reused 0 (delta 0)
To [email protected]:aurelian/slobo.git
* [new branch] origin/remote_foo -> origin/remote_foo
finques /tmp/slobo(foo) $ git st
# On branch foo
# Your branch is ahead of 'origin/remote_foo' by 1 commit.
#
nothing to commit (working directory clean)
finques /tmp/slobo(foo) $ git push
Everything up-to-date
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
url = [email protected]:aurelian/slobo.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "foo"]
remote = origin
merge = refs/heads/remote_foo
[branch "bar"]
remote = origin
merge = refs/heads/remote_bar
[push]
default = current
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment