-- HecPeAre - 05 Apr 2008

GitHub - cheat sheet

-- HecPeAre - 05 May 2008

echo '.*.swp' >> .git/info/exclude

-- HecPeAre - 05 May 2008

New branch:

• git branch -b new_branch_name

• cat patch_file.diff | git am

gitk, test...

Ok:

• git checkout master
• git merge branch_name
• git push origin master

• git branch -D branch_name

• git push origin :branch_name (after removing from local)

(thanks to robe5)

-- HecPeAre - 25 Jun 2008

Rename branch:

• git-branch -m old_branch_name new_branch_name

-- HecPeAre - 25 Jun 2008

http://www.inwebwetrust.net/post/2008/05/31/diferencias-colorizadas-svn-y-git#comentarios

-- HecPeAre - 28 Jun 2008

Show all branches:

• git branch -a

• git checkout branch_name

-- HecPeAre - 13 Jul 2008

Include (branch) in the prompt:

git_branch() {

git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1) /'

}

export PS1="\u@\h:\w \$(git_branch)$ "

-- HecPeAre - 14 Jul 2008

git checkout master

git merge edge

-- HecPeAre - 24 Jul 2008

Others:

Mercurial - wp