Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- freenet$ mkdir fred
- freenet$ cd fred/
- freenet/fred$ git init
- Initialized empty Git repository in /home/sdiz/build/freenet/fred/.git/
- freenet/fred$ <edit file=".git/config">
- [core]
- repositoryformatversion = 0
- filemode = true
- bare = false
- logallrefupdates = true
- [remote "official"]
- url = git://github.com/freenet/fred-official.git
- fetch = +refs/heads/*:refs/remotes/official/*
- [remote "staging"]
- url = git@github.com:freenet/fred-staging.git
- fetch = +refs/heads/*:refs/remotes/staging/*
- push = refs/heads/staging:refs/heads/master
- [user]
- name = Daniel Cheng (鄭郁邦) <freenet@freenetproject.org>
- email = freenet@freenetproject.org
- [branch "stable"]
- remote = official
- merge = refs/heads/master
- rebase = true
- [branch "staging"]
- remote = staging
- merge = refs/heads/master
- rebase = true
- </edit>
- freenet/fred$ git fetch official ; git fetch staging
- [.......]
- freenet/fred$ git branch stable official/master
- freenet/fred$ git branch staging staging/master
- freenet/fred$ git checkout -f staging
- warning: You appear to be on a branch yet to be born.
- warning: Forcing checkout of staging.
- Switched to branch "staging"
- freenet/fred$ ls
- AUTHORS build_binary.xml build.xml devnotes LICENSE.Freenet LICENSE.Mantissa README src test
- freenet/fred$ # List the changes from stable to HEAD
- freenet/fred$ git log stable..
- commit b043b9ca080d7c454e34eb5fb9dc506c514d6798
- Author: Thomas Sachau <tommy@gentoo.org>
- Date: Sat Apr 25 14:36:27 2009 +0200
- Test commit
- freenet/fred$ # .... and with diffs
- freenet/fred$ git log -p stable..
- commit b043b9ca080d7c454e34eb5fb9dc506c514d6798
- Author: Thomas Sachau <tommy@gentoo.org>
- Date: Sat Apr 25 14:36:27 2009 +0200
- Test commit
- diff --git a/README b/README
- index ab7659e..981020e 100644
- --- a/README
- +++ b/README
- @@ -101,3 +101,4 @@ other code:
- - Mantissa is under the modified BSD license. See README.Mantissa. According
- to the FSF, modified BSD is compatible with GPL; we must include both
- licenses.
- +
- freenet/fred$ <edit something locally>
- freenet/fred$ git commit -av
- freenet/fred$ git push staging
- Counting objects: 21, done.
- Compressing objects: 100% (13/13), done.
- Writing objects: 100% (13/13), 1.60 KiB, done.
- Total 13 (delta 9), reused 0 (delta 0)
- To git@github.com:freenet/fred-staging.git
- b043b9c..63c006d master -> master
- freenet/fred$
Add Comment
Please, Sign In to add comment