gistfile1.txt

[zmack@cartofior projects]$ git clone [email protected]:zmack/randomista.git
Initialized empty Git repository in /Users/zmack/projects/randomista/.git/
remote: Counting objects: 66, done.
remote: Compressing objects: 100% (47/47), done.
remote: Total 66 (delta 12), reused 59 (delta 10)
Receiving objects: 100% (66/66), 79.22 KiB | 57 KiB/s, done.
Resolving deltas: 100% (12/12), done.
[zmack@cartofior projects]$ cd randomista/
[zmack@cartofior randomista (master)]$ git branch cal --track origin/foo
Branch cal set up to track remote branch foo from origin.
[zmack@cartofior randomista (master)]$ gco cal
Switched to branch 'cal'
[zmack@cartofior randomista (cal)]$ gst
# On branch cal
nothing to commit (working directory clean)
[zmack@cartofior randomista (cal)]$ git log
commit ddc3a1c46b971802d8fd7214478e8a40ed8852ad
Author: Andrei Bocan <[email protected]>
Date:   Fri Jul 31 14:34:49 2009 +0300

    Oh my, foo !

commit 66a162f59a8f57ddb3afd0fe3d9d6b2aadb53672
Author: Andrei Bocan <[email protected]>
Date:   Fri Jul 31 14:24:50 2009 +0300

    Added moloz

commit 88368bfef58b62dcf5c4fadfc7ca650f9b20e791
Author: Andrei Bocan <[email protected]>
Date:   Wed Jun 3 18:59:59 2009 +0300

    Initial commit
[zmack@cartofior randomista (cal)]$ gco master
Switched to branch 'master'
[zmack@cartofior randomista (master)]$ git merge cal
Updating 66a162f..ddc3a1c
Fast forward
 foo |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
[zmack@cartofior randomista (master)]$ gst
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#
nothing to commit (working directory clean)
[zmack@cartofior randomista (master)]$ git push
Total 0 (delta 0), reused 0 (delta 0)
To [email protected]:zmack/randomista.git
   66a162f..ddc3a1c  HEAD -> master

gistfile2.txt

[zmack@cartofior randomista (master)]$ gst
# On branch master
nothing to commit (working directory clean)
[zmack@cartofior randomista (master)]$ git branch foo --track origin/foo
Branch foo set up to track remote branch foo from origin.
[zmack@cartofior randomista (master)]$ git branch bar --track origin/bar
Branch bar set up to track remote branch bar from origin.
[zmack@cartofior randomista (master)]$ gco foo
Switched to branch 'foo'
[zmack@cartofior randomista (foo)]$ git merge bar
Updating ddc3a1c..d699902
Fast forward
 bar |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 bar
[zmack@cartofior randomista (foo)]$ git push
Total 0 (delta 0), reused 0 (delta 0)
To [email protected]:zmack/randomista.git
   ddc3a1c..d699902  HEAD -> foo

gistfile3.txt

[remote "origin"]
	fetch = +refs/heads/*:refs/remotes/origin/*
	url = [email protected]:zmack/randomista.git
[branch "master"]
	remote = origin
	merge = refs/heads/master
[branch "foo"]
	remote = origin
	merge = refs/heads/foo
[branch "bar"]
	remote = origin
	merge = refs/heads/bar

gistfile4.txt

[zmack@cartofior slobo (foo)]$ git branch remote_foo --track origin/remote_foo
Branch remote_foo set up to track remote branch remote_foo from origin.
[zmack@cartofior slobo (foo)]$ gco remote_foo
Switched to branch 'remote_foo'
[zmack@cartofior slobo (remote_foo)]$ gst
# On branch remote_foo
nothing to commit (working directory clean)
[zmack@cartofior slobo (remote_foo)]$ git merge bar
Updating 78d8489..dd29eb3
Fast forward
 a.txt |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 a.txt
[zmack@cartofior slobo (remote_foo)]$ gst
# On branch remote_foo
# Your branch is ahead of 'origin/remote_foo' by 1 commit.
#
nothing to commit (working directory clean)
[zmack@cartofior slobo (remote_foo)]$ git push
Total 0 (delta 0), reused 0 (delta 0)
To [email protected]:zmack/slobo.git
   78d8489..dd29eb3  HEAD -> remote_foo