Everyday effectiveness with git

Everyday Effectiveness with git
John Kary
johnkary@
gmail.com
@
johnkary
Slides available at http://johnkary.net/talks
Sunday, April 22, 2012

View Slide

Intermediate
?
• Version control?
• git status, add, commit, log
• git Immersion
http://gitimmersion.com
• Branching and merging
• Maybe how git works internally
• Getting git by Scott Chacon
http://blip.tv/scott-chacon/git-talk-4113729

View Slide

Overview
• Getting over the hurdle
• Setting up your environment
• Workﬂow

View Slide

Part 1
Getting over the hurdle
Source: http://www.ﬂickr.com/photos/keokiseu/4620268471/

View Slide

git
pre
post

View Slide

git

View Slide

Chad Dickerson
CEO @ Etsy
RailsConf 2011 Keynote
http://codeascraft.etsy.com/2011/06/06/optimizing-for-developer-happiness/
Optimize for
developer happiness.
“
”

View Slide

Excuses

View Slide

I keep backups.

View Slide

No, really, I keep backups.

View Slide


View Slide

+ Automagically syncs
+ Cloud!
+ Distributed
+ Built-in versioning
- Not searchable by contents
- Not easy to experiment and roll-back
- No diff-view between versions
- No version metadata
- Saved versions for only last 30 days
Dropbox versioning is...

View Slide

is Versioning
NOT Version-Control

View Slide

I’ve tried _____

View Slide

I’ve tried _____
it gets in the way
of getting real work done

View Slide

Photo: Photo by Jesse D. Garrabrant/NBAE via Getty Images
The Truth Is...
Learning git is an Investment
It becomes second nature
Accomplish More
Work Faster
Jump Higher

View Slide

Has anyone picked up
version control recently?

View Slide

Part 2
Setting up your environment
Source: http://www.ﬂickr.com/photos/akahodag/3753216775/

View Slide

Installing git
~ $ brew install git
...
~ $ which git
/usr/local/bin/git
Homebrew
The missing package manager for OS X
http://mxcl.github.com/homebrew/

View Slide

Installing git
~ $ man git-log
GIT-LOG(1) Git Manual GIT-LOG(1)
NAME
git-log - Show commit logs
SYNOPSIS
git log [] [..] [[--] ...]
DESCRIPTION
Shows the commit logs.
The command takes options applicable to the git rev-list command
to control what is shown and how, and options applicable to the git
Easy man page access

View Slide

Installing git
~ $ cat ~/.bash_profile
source `brew --prefix git`/etc/bash_completion.d/git-completion.bash
~ $ source ~/.bash_profile
~ $ git sta
stage stash status
~ $ git sta
Bash command auto-completion

View Slide

Interacting with your repository

View Slide

For those already using git...
Who is using a GUI?

View Slide

For those already using git...
Who is using a CLI?

View Slide

git tower - http://www.git-tower.com

View Slide

Gitbox - http://www.gitboxapp.com/

View Slide

github for mac - http://mac.github.com/

View Slide

Strongly
STRONGLY
encourage you to
NOT
use a GUI

View Slide

git GUIs
• Dumb-down underlying commands
• Present limited command options
• Not available on most remote servers
• But there is one I recommend...

View Slide

GitX - http://brotherbard.com/blog/2010/03/experimental-gitx-fork/

View Slide

(master) ~/Sites/mysite $ gitx

View Slide

~ $ git config --global alias.lola "log --graph --decorate >>
--pretty=oneline --abbrev-commit --all"
(master) ~/Sites/mysite $ git lola
git log-one-line --all (lola)
Useful when on a remote sever

View Slide

Customizing your shell

View Slide

PS1
~ $ cat ~/.bash_config
source `brew --prefix git`/etc/bash_completion.d/git-completion.bash
export PS1="\[\e[0;34m\]\$(__git_ps1) \[\e[0;31m\]\w \[\e[0m\]$ "
(master) ~/Sites/mysite $ git checkout 9d9bc29
Note: checking out '9d9bc29'.
You are in 'detached HEAD' state. You can look around, make experimental
...
((9d9bc29...)) ~/Sites/mysite $

View Slide

• gitﬂow - https://github.com/nvie/gitﬂow
• git-extras - https://github.com/visionmedia/git-extras
• git-legit - http://www.git-legit.org
• Roll your own!
Command aliases

View Slide

Command aliases
~ $ cat ~/.bash_config
alias g="git status"
alias go="git checkout"
alias ga="git add"
alias gap="git add -p"
alias gb="git branch"
alias gca="git commit -v --amend"
Shell

View Slide

Command aliases
(master) ~/Sites/mysite $ g
# On branch master
nothing to commit (working directory clean)
alias g="git status"
(master) ~/Sites/mysite $ go 9d9bc29
Note: checking out '9d9bc29'.
You are in 'detached HEAD' state. You can look around, make experimental
...
((9d9bc29...)) ~/Sites/mysite $
alias go="git checkout"

View Slide

Command aliases
# On branch master
# Untracked files:
# (use "git add ..." to include in what will be committed)
#
# test.php
nothing added to commit but untracked files present (use "git add" to track)
(master) ~/Sites/mysite $ ga test.php
# On branch master
# Changes to be committed:
# (use "git reset HEAD ..." to unstage)
#
# new file: test.php
#
alias ga="git add"

View Slide

Command aliases
(master) ~/Sites/mysite $ git commit -m "Add README"
[master 05b8075] Add README
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 README
(master) ~/Sites/mysite $ gca
1 Updated README
2
3 # Please enter the commit message for your changes. Lines starting
4 # with '#' will be ignored, and an empty message aborts the commit.
5 # On branch master
6 # Changes to be committed:
7 # (use "git reset HEAD^1 ..." to unstage)
8 #
9 # new file: april21-2012.zip
10 #
alias gca="git commit -v --amend"

View Slide

Command aliases
(master) ~/Sites/mysite $ gap
diff --git a/README b/README
index 7c39865..1056e9e 100644
--- a/README
+++ b/README
@@ -1,3 +1,4 @@
My Cool Project
+Author: John Kary
-This is my first commit.
+This is my second commit.
Stage this hunk [y,n,q,a,d,/,s,e,?]? y

View Slide

Command aliases
Stage this hunk [y,n,q,a,d,/,s,e,?]? ?
y - stage this hunk
n - do not stage this hunk
q - quit; do not stage this hunk nor any of the remaining ones
a - stage this hunk and all later hunks in the file
d - do not stage this hunk nor any of the later hunks in the file
g - select a hunk to go to
/ - search for a hunk matching the given regex
j - leave this hunk undecided, see next undecided hunk
J - leave this hunk undecided, see next hunk
k - leave this hunk undecided, see previous undecided hunk
K - leave this hunk undecided, see previous hunk
s - split the current hunk into smaller hunks
e - manually edit the current hunk
? - print help

View Slide

(master) ~/Sites/mysite $ gap
diff --git a/README b/README
index 7c39865..1056e9e 100644
--- a/README
+++ b/README
@@ -1,3 +1,4 @@
My Cool Project
+Author: John Kary
Stage this hunk [y,n,q,a,d,/,s,e,?]? s

View Slide

...
Stage this hunk [y,n,q,a,d,/,s,e,?]? s
Split into 2 hunks.
@@ -1,2 +1,3 @@
My Cool Project
+Author: John Kary
Stage this hunk [y,n,q,a,d,/,j,J,g,e,?]? y
@@ -2,2 +3,2 @@
Stage this hunk [y,n,q,a,d,/,K,g,e,?]? n
(master) ~/Sites/mysite $ git status

View Slide

...
(master) ~/Sites/mysite $ git status
# On branch master
# Changes to be committed:
# (use "git reset HEAD ..." to unstage)
#
# modified: README
#
# Changes not staged for commit:
# (use "git add ..." to update what will be committed)
# (use "git checkout -- ..." to discard changes in working directory)
#
# modified: README
#
(master) ~/Sites/mysite $ git commit -m "Add author"

View Slide

...
(master) ~/Sites/mysite $ git lola
* c7ccfcb (HEAD, master) Add README note
* 9e35c29 Add author
* 34501c6 Added first README

View Slide

git aliases
~ $ git config --global alias.cp "cherry-pick"
~ $ cat ~/.gitconfig
[alias]
b = checkout -b
bd = branch -d
changelog = log --oneline --reverse
cp = cherry-pick
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
difffiles = diff --name-only
unstage = reset HEAD

View Slide

Part 3
Workflows
Source: http://www.ﬂickr.com/photos/antiuser/789307913/

View Slide

Sharing Models

View Slide

Sharing Models
Sole Developer
John

View Slide

Sharing Models
Sole Developer
with a remote server
John
Server

View Slide

Sharing Models
Fully Distributed
John Chris
Bill

View Slide

Sharing Models
Fully Distributed
bananajour
https://github.com/toolmantim/bananajour

View Slide

Sharing Models
Hybrid - Centrally Distributed
John Chris
Bill
Central Server

View Slide

Sharing Models
Hybrid - Centrally Distributed

View Slide

Sharing Models
Sole Developer
with a remote server
John
Server

View Slide

Time for some live coding examples...

View Slide

Resources
John Kary
johnkary@
gmail.com
@
johnkary
Online git tutorial - http://gitimmersion.com
Getting git by Scott Chacon - http://blip.tv/scott-chacon/git-talk-4113729
Optimize for developer happiness - http://codeascraft.etsy.com/2011/06/06/optimizing-for-developer-happiness/
Homebrew - http://mxcl.github.com/homebrew/
git tower - http://www.git-tower.com/
Gitbox - http://www.gitboxapp.com/
github for mac - http://mac.github.com/
gitﬂow - https://github.com/nvie/gitﬂow
git-extras - https://github.com/visionmedia/git-extras
git-legit - http://www.git-legit.org
bananajour - https://github.com/toolmantim/bananajour
Live-coding repo - https://github.com/johnkary/everyday-git
Slides - http://johnkary.net/talks

View Slide

Everyday effectiveness with git

Everyday effectiveness with git

John Kary

More Decks by John Kary

Other Decks in Programming

Featured

Transcript