Git is your friend

it's just autistic.

Krzysztof Morcinek
Jul 16, 2013

Welcome

• Ask question during presentation
• I am not pro in presentations, feedback appreciated
• Using git for 1,5 year, 4 month on a company project hosted on GitHub
• No agenda, we will see how will it go

Why we need learn

• More sofisticated than centralized control systems
• Complains on stand-ups
• The same output achieved in many ways
• gitbook - Pro Git
• gitbook - Pro Git - polish

Decentralized

• No server needed
• Whole history, logs always with you
• Work offline

Intermediate step

• 
• git add .
• git commit -am
• You don't need it

Commit and sha1 on our disk

• Demo
• Empty folder
• git init
• look to '.git/objects'
• touch file.txt
• git add file.txt
• git commit -m "initial"
• look to '.git/objects'

Commit and sha1 on our disk #2

head, branch, commit correlation

• commit ~ sha1
• branch
• HEAD (UPPERCASE convention, lowercase is also fine)
• parents: ~4 ^ ^^^
• git commit --amend
• pointers

Git Branching

• Live on gitbook
• Really worth reading
• questions?

Undoing things

• reset --hard sha1
• reset HEAD^
• commit --amend -a
• commit -a (just commit), later: rebase -i
• Demo

Synchronize from others and resolve conflicts

• Demo
• git pull --rebase
• git config --global --bool pull.rebase true
• I never used fetch (creates no commit)

What happens in Git, stays in git

• git reflog (whole history)

In the middle of work example

• "Jestem koniem, nie mogę ci pomóc"
• stash
• branch
• just commit :)

git rebase -i

• Demo
• I know VIM - come to me
• cherry-pick

merge vs rebase

• Demo
• Fasted demo

Command mappings

wherever its possible

• Revert: git reset --hard, git clean -fd
• git revert changes, google->Stack Overflow, enormous number of votes on git
• mappings are antipatterns

Workflow

• Keep up to date with master
• Feature branch is antipattern

My tools

• console is king
• really use it, only good patterns
• GitHub for Windows - browsing history, (DONT use magic Sync button)

Other

• TortoiseGit have old well known command mappings (Revert)
• aliases
• edit .gitconfig in user folder to add aliases
• my gist about aliases

GitHub

• This presentation hosted on github.io
• Collaborative platform
• No side TODO list, integrated Issues
• Wiki
• You changes accessible by link, no need for revision id and searching
• Compare ranges

References

• GitBook
• Merge vs Rebase comparision
• my gist about git (not revied)
• my gist about aliases