gistfile1.txt

GIT TIPS

CONFIG
git config --global user.name "Jair Gaxiola"
git config --global user.email jyr.gaxiola@gmail.com

CREAR REPOSITORIO
 - mkdir popcorn-wrapper
 - cd popcorn-wrapper
 - git init
 - touch README
 - git add README
 - git commit -m 'first commit'
 - git remote add origin git@github.com:jyr/popcorn-wrapper.git
-  git push origin master


ACTUALIZAR REPOSITORIO LOCAL
-git pull

LISTADO DE BRANCH LOCAL
-git branch

CHECKOUT LOCAL
-git checkout windows

BORRAR RAMA
- git branch -d windows

PUSH
git push git@github.com:jyr/opentumblr.git

ACTUALIZAR BRANCH REMOTO
-git pull origin windows

LISTADO DE BRANCH REMOTO
-git branch -r

CHECKOUT RAMA REMOTA	
-  git checkout -b windows origin/windows

MERGE
- git checkout -b linux origin/linux
- git merge master
- editar los archivos con conflictos
- git add setup.py
- git commit -m "algo"
- git push

TAGS

- git tag -a 0.0.5 -m "Version 0.0.5, dashboard with dialogs "
- git push --tags git@github.com:jyr/opentumblr.git

GIT-PAGES
git checkout origin/gh-pages -b gh-pages