git flow release a new version

gitflow how to release a new version

steps can be found here. In particular,

• create a release branch

  $ git checkout -b release-2.1 develop  

• work on the release branch such as bumping up the version

• merge to master and develop branch

• create a tag

  $ git checkout master  $ git merge --no-ff release-2.1  $ git tag -a v2.1   

• push the tag, see here

  $ git push origin v2.1 

git diff no color but special characters

Change env LESS
See http://goo.gl/gXrNcT

where to download git source pkg

https://www.kernel.org/pub/software/scm/git/

a good website teaching you how to make an R package

howtomakeanrpackage.pbworks.com

quick proxy for chrome

https://chrome.google.com/webstore/detail/quick-proxy/gchhimlnjdafdlkojbffdkogjhhkdepf

ssh -D 

proxytype: sock5

git rewriting history

see 6.4 Git Tools - Rewriting History

http://git-scm.com/book/en/Git-Tools-Rewriting-History

git status -uno

  git status -uno

a couple of git branch cmds

1. create a new branch from origin's branch

git checkout -b serverfix origin/serverfix

2. get everything from origin

git fetch origin 

3. deleting remote branch

git push origin :serverfix

Note that the syntax for git push is

git push [remote name] [local branch]:[remote branch]

source:

http://git-scm.com/book/en/Git-Branching-Remote-Branches