User Tools

Site Tools


git

This is an old revision of the document!


Contribute to github

  1. configure local git
     $ git config --global user.name "Frank Deng"
     $ git config --global user.email "frank.deng@oracle.com"
  2. fork a repo on github.com
  3. clone repo
     $ git clone https://github.com/frdeng/oraclelinux.git
  4. add upstream to your repo
     $ git remote add upstream https://github.com/boxcutter/oraclelinux.git
  5. fetch upstream
     $ git fetch upstream
  6. set upstream branch
     $ git branch --set-upstream-to=upstream/master master
  7. create new branch for changes
     $ git checkout -b newfix
  8. make code changes
  9. add changes
     $ git add .
  10. commit changes
     $ git commit -m "comments"
  11. push to origin
     $ git push --set-upstream origin newfix
  12. create new pull request on github.com
  13. Once PR is accepted, the fix is merged to upstream, then sync up with upstream. Fetch upstream, and rebase upstream, then push to own forked repo(origin>
    $ git checkout master
    $ git fetch upstream
    $ git rebase upstream/master
    $ git push origin master

get remote release branch

$ git branch --track remotes/origin/release-3.1

get diff between branches

$ git diff release-3.1..master -- version/
diff --git a/version/version.go b/version/version.go
index 6cb3c08..9134ceb 100644
--- a/version/version.go
+++ b/version/version.go
@@ -26,7 +26,7 @@ import (
 var (
        // MinClusterVersion is the min cluster version this etcd binary is compatible with.
        MinClusterVersion = "3.0.0"
-       Version           = "3.1.0+git"
+       Version           = "3.2.0+git"
        APIVersion        = "unknown"
 
        // Git SHA Value will be set during build
git.1484965163.txt.gz · Last modified: 2017/01/20 18:19 by frank