GIT

• http://www.git-legit.org

Learning Git

• http://www.zdrojak.cz/serialy/pet-duvodu-proc-zvolit-git/
• http://www.zdrojak.cz/clanky/jasne-umim-git/
• http://www.itnetwork.cz/git-verzovaci-nastroj-tutorialy
• http://www.slant.co/topics/517/~what-is-the-best-resource-for-learning-git
• https://www.atlassian.com/git
• http://gitimmersion.com
• http://git-scm.com/book/cs
• http://firstaidgit.io

Hosting

• https://githost.io

Setup

• http://wiki.zenoss.org/Using_GitHub_For_Your_ZenPack
• https://gist.github.com/jexchan/2351996

sudo apt-get install gitk

git config --global user.email ""
git config --global user.name ""
git config --global push.default current

git config --global alias.ch checkout
git config --global alias.br branch
git config --global alias.co 'commit -am'
git config --global alias.st status
git config --global alias.unstage 'reset HEAD --'
git config --global alias.last 'log -1 HEAD'
git config --global alias.visual '!gitk'

Remove last commit git reset HEAD^

URL

vi .git/config

[remote "origin"]
  url = ssh://github_my/josefjezek/repo

Generate Key

• http://www.cyberciti.biz/faq/howto-ssh-changing-passphrase

ssh-keygen -t rsa -f ~/.ssh/id_rsa_github -C "your_email@youremail.com"
ssh-add ~/.ssh/id_rsa_github
ssh-add -l
cat ~/.ssh/id_rsa_github.pub

SSH config

Host github
    HostName github.com
    User git
    VerifyHostKeyDNS yes
    IdentityFile ~/.ssh/id_rsa_github

Commit

git add index.html | git add .
git commit -a -m "First pages commit"
git push origin gh-pages

Diff

• http://stackoverflow.com/questions/1191282/git-diff-commits-difference

git diff 0da94be  59ff30c > my.patch
git apply my.patch

Update

git commit -a -m "Update"
git pull origin gh-pages

Tag

Show Tags

git fetch --tags
git tag -l

Checkout Latest Tag

# Get new tags from remote
git fetch --tags

# Get latest tag name
latestTag=$(git describe --tags `git rev-list --tags --max-count=1`)

# Checkout latest tag
git checkout $latestTag

• http://stackoverflow.com/questions/791959/how-to-use-git-to-download-a-particular-tag

Fix

gitignore

git rm -r --cached .
git add .
git commit -m ".gitignore is now working"

• http://stackoverflow.com/questions/1139762/gitignore-file-not-ignoring

Merge two different repository

if you have two differents repositry (first and second) to merge in one even in local :

we create a new git repository ans make an initial commit :

mkdir newRepository
git init
touch .gitignore
git add .gitignore
git commit .gitignore -m 'init'

we fetch and merge the first

git remote add first pathTo/first
git fetch first
git merge first/master

we fetch and merge the second

git remote add second pathTo/second
git fetch second
git merge second/master

Resources

• https://help.github.com/articles/creating-project-pages-manually