Post on 10-Apr-2015
description
GIT INCEPTIONnick quaranto
http://capeco.de
Thursday, August 19, 2010
SHARE CODE LOCALLY
gem install bananajour
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
RECAP
gem install bananajour
cd repo; bananajour init
git push banana master
bananajour
Thursday, August 19, 2010
SQUASH COMMITS
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
RECAP
git checkout topic
git rebase -i master
(keep top patch as “pick”, rest “squash”)
git checkout master
git merge topic
Thursday, August 19, 2010
SHORTEN YOUR STATUS
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
RECAP
git status -sb
git config --global alias.st "status -sb"
git st
Thursday, August 19, 2010
INCREMENTALLY STAGE CODE
Thursday, August 19, 2010
FFFFUUUUUUUUUUThursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
RECAPgit add -p
y: stage this hunk
n: skip this hunk
s: split this hunk
e: manually edit this hunk
g: move around to other hunks
?: view help
Thursday, August 19, 2010
SPRING CLEANING
git remote prune origin
git gc --aggressive
git stash clear
Thursday, August 19, 2010
WHO BROKE THE BUILD
git blame path/to/file.rb
Thursday, August 19, 2010
Thursday, August 19, 2010
WE MUST GO DEEPER
Thursday, August 19, 2010
WHERE DID THAT LINE COME FROM
git blame -C path/to/file.rb
Thursday, August 19, 2010
Thursday, August 19, 2010
WE MUST GO EVEN DEEPER
Thursday, August 19, 2010
DIVE THROUGH INTERACTIVELY
git gui blame path/to/file.rb
Thursday, August 19, 2010
CHANGE COMMIT MESSAGES
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
RECAP
last commit:
git commit --amend
several back:
git rebase -i <treeish>
(change pick to reword)
Thursday, August 19, 2010
SEE FILES FROM OTHER BRANCHES
git show <treeish>:path/to/file.rb
git show <treeish>:
Thursday, August 19, 2010
Thursday, August 19, 2010
Thursday, August 19, 2010
DIFF BETTER
Thursday, August 19, 2010
Thursday, August 19, 2010
git diff | gitx
Thursday, August 19, 2010
ANNOTATE EXISTING COMMITS
Thursday, August 19, 2010
Thursday, August 19, 2010
RECAP
git notes add -m “some info”
git notes show
git notes append -m “more info”
git log -p
Thursday, August 19, 2010
THANKS
Thursday, August 19, 2010