Git Micro Workflows: Little Red Riding Hood

Git Workflows: Little Red Riding Hood !

Git Micro Workflows: Little Red Riding Hood !

Travis Douce [email protected]! [email protected]! Twitter: @travisdouce GitHub: tdouce

Git Micro Workflows: Little Red Riding Hood !

What is Git? Create repo Basic workflow Understanding history Rebase
(interactive) Branches Merge Remotes Merge vs Rebase

The better you are with your tools, the better developer
you will be

What is Git?

Distributed Version Control What is Git?

essay.doc

essay.doc essay_intro_1.doc

essay_intro_2.doc essay.doc essay_intro_1.doc

essay_intro_body_3.doc essay.doc essay_intro_1.doc essay_intro_2.doc

The Brothers Grimm Wilhelm Jacob

Getting Started

Create Repo

Create Repo Repository created in this directory

Status Status of repository

Status

Create file Create ﬁle little_red_riding_hood.txt

Status

Add Color Conﬁgure output with color

Add Color Global

Add Color Yes, color the output

Status

Track Track changes to ﬁle

Track Name of ﬁle

Status

Staged

Commit Commit all ﬁles in staging ! to local repository

opens editor

* See end of slides for writing great commit messages
commit message

* See end of slides for writing great commit messages
extended description

save and close

Commit It worked!

Status

Jacob writes … The Little Red Riding Hood

little_red_riding_hood.txt

save and close

Status

Modified

Staging? What’s the purpose of

Staging? All files in staging will be included in next
commit What’s the purpose of

Status

Commit Commit all ﬁles in staging ! to local repository

opens editor opens editor save opens editor

opens editor opens editor save commit message

opens editor opens editor save save and close

Commit

Status

Work Flow # 1

Work Flow # 1 Modified Staged Committed

Jacob writes an introduction

Jacob writes an introduction and that is HARD

save and close

Status

Modified

Status

Staged

Commit

opens editor

commit message

Commit

It’s good, but … little_red_riding_hood.txt

It’s good, but … save and close

Make a WIP commit

Make a WIP commit Work In Progress

Make a WIP commit Work In Progress Just a convention

Status

Commit Commit and provide message

Commit Commit message

Commit

Yes, this is it! little_red_riding_hood.txt

Yes, this is it! save and close

Status

Modified

Commit Commit and provide message

Commit Commit message

Commit

Work Flow # 2

Work Flow # 2 Make WIP commits

Work Flow # 2 Developing complicated features Make WIP commits

Work Flow # 2 Preserve each implementation Make WIP commits
Developing complicated features

Git history

Git history (and the many ways to view it)

Understanding git history

Log Newest Oldest

Log #5 Newest Oldest

Log Author Newest Oldest

Log Date Newest Oldest

Log Commit message Newest Oldest

What are these?

These are shas Unique identiﬁer! for commit

Another way to view history

Log with patch A more details view of history

Log with patch Patch ﬂag

Log with patch Patch *Displaying most recent commit only

And, another way to view history

Log as graph *lg alias at end of slides Jacob
conﬁgured a git alias, lg. When entered, history is displayed a graph

Log as graph Newest Oldest

Log as graph Commit message Newest Oldest

Log as graph Author Newest Oldest

Log as graph Date Newest Oldest

Newest Oldest Log as graph

What is HEAD? HEAD Parent of next commit

What is HEAD? 1 2 HEAD, master Newest Oldest

1 2 HEAD, master 3 Next commit is on top
of HEAD What is HEAD? Newest Oldest

1 2 HEAD, master 3 What is HEAD? Newest Oldest

1 2 HEAD, master 3 4 Next commit is on
top of HEAD What is HEAD? Newest Oldest

1 2 HEAD, master 3 4 What is HEAD? Newest
Oldest

What is master? master Default branch (we’ll cover branches later)

Understanding log as graph master has commits master

Understanding log as graph master has commits

The ugly history

3 commits about writing introduction Ugly history

Proposed clean history 3 commits about writing introduction 1 commit

Why do we care about a clean history?

Re-write history

Start rewriting history at! Adds introductory sentence commit Log as
a graph

Log as a graph Start rewriting history at! Adds introductory
sentence commit

copy sha to clipboard Log as a graph

Rebase: interactive Re-write history

Interactive mode Rebase: interactive

sha from clipboard Rebase: interactive

Not child of sha, but this sha Rebase: interactive

What will happen? (theoretically)

Rebase: Interactive 1 2 3 4 HEAD, master Newest Oldest

Rebase: Interactive HEAD, master Newest Oldest Start rebasing at! this
commit 1 2 3 4

2 3 4 HEAD, master 1 Rebase: Interactive

2 3 4 HEAD, master 1 Rebase: Interactive 2 3
4

Meld together 1 Rebase: Interactive 2 3 4 HEAD, master
2 3 4

5 New sha 1 Rebase: Interactive 2 3 4 HEAD,
master

5 1 Rebase: Interactive 2 3 4 HEAD, master

5 1 HEAD, master Rebase: Interactive 2 3 4 HEAD,
master

Created a new base 5 1 HEAD, master Rebase: Interactive
2 3 4 HEAD, master

Rebase: interactive

opens editor

Newest Oldest

f f save and close

Rebase: interactive

Rebase: interactive It worked!

Rebase: interactive $ git rebase --abort If things go wrong!

Rebase Double edged sword

Log as a graph

Log as a graph 3 commits about writing introduction 1
commit

8979394 != ed04ae2 Log as a graph

Work Flow # 3

Work Flow # 3 Keep a clean history

Work Flow # 3 (Not so much how you got
there, but sometimes I do) I want to know what you did Keep a clean history

there, but sometimes I do) Helps with code reviews by revealing intent I want to know what you did Keep a clean history

there, but sometimes I do) Helps with code reviews by revealing intent Can rebase to organize history I want to know what you did Keep a clean history

3 a.m. and Jacob is

Status

Modified

Commit Stage and commit

commit message

save and close

Commit

Log with patch

Log with patch Displaying most recent commit only

Jacob realizes commit error

Jacob fixes commit error

Jacob fixes commit error Undo last commit

Proposed Undo

Proposed Undo Erroneous commit

Proposed Undo Commit prior to error

Proposed Undo Move HEAD and master backwards one commit

Reset Move HEAD back 1 commit

Move HEAD back 1 commit (but keep changes) Reset

HEAD Reset

Backwards 1 commit Reset

Reset It worked!

Log as graph

Jacob rewrites erroneous sentence

save and close

Status

Modified

Commit with verbose View changes while writing commit message

Commit with verbose Verbose Flag

commit message

save and close

Commit with verbose

Commit with verbose ALWAYS

Commit with verbose Verbose commit with $ git ci

Commit with verbose Global

Commit with verbose When enter $ git ci

Commit with verbose Then commit with —verbose

Work Flow # 4

Work Flow # 4 AlWAYS! Verbose commit

Work Flow # 4 Write better commit messages AlWAYS! Verbose
commit

Work Flow # 4 Write better commit messages Reduce erroneous
commits Verbose commit AlWAYS!

Jacob writes body of Little Red Riding Hood using feature
branches

List branches List all branches in repository

List branches On master branch Remember, master is the default
branch

Branches Create branch and switch to it

Branches Branch name

Branches authorFirstName_authorLastName/description_of_branch Branch name

authorFirstName_authorLastName/description_of_branch Branches Branch name

Branches authorFirstName_authorLastName/description_of_branch Branch name

Branches jacob_grimm/body Branch name

Branches Just a convention Branch name

Branches It worked!! Created jacob_grimm/body and switched to it

Branches List all branches in repository

Branches 2 branches

Branches On jacob_grimm/body branch

Log as graph

HEAD is at commit Log as graph

master is at commit Log as graph

HEAD is at commit jacob_grimm/body Log as graph

master and jacob_grimm/body have commits Log as graph

What branch am I on? You are here

What branch am I on?

Display branch in prompt * bash script at end of
slides

Display branch in prompt Always display branch name in prompt

little_red_riding_hood.txt save and close

Status

Modified

Commit Stage and commit

commit message

save and close

Commit

The history of master and jacob_grimm/body have diverged

Log as graph

jacob_grimm/body has commits Log as graph

master has commits Log as graph

master does NOT have commit Log as graph

Work Flow # 5

Work Flow # 5 Feature branches

Work Flow # 5 Feature branches Isolate feature development

Work Flow # 5 Feature branches Isolate feature development Easily
determine author of feature

Jacob finishes jacob_grimm/body

Decides it should be in the story of Little Red
Riding Hood

Incorporate jacob_grimm/body into master

Switch branches Currently, on jacob_grimm/body branch

Switch branches Switch to master branch

Switch branches Branch name to switch to

Switch branches It worked!! Switched to master

Merge Incorporate jacob_grimm/body into master

Branch name to incorporate into master Merge

1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest
Oldest

Oldest

5 1 2 3 4 6 , HEAD, master jacob_grimm/body
Newest Oldest

Merge It worked!

Merge Fast Forward merge strategy

if possible. Git will Fast-foward merge,

Log as graph

master and jacob_grimm/body have commits Log as graph

Log as graph master and jacob_grimm/body have commits

What commits originated in jacob_grimm/body?

Log as graph

What commits originated in jacob_grimm/body? ¯\_(π)_/¯

Make it easy to determine the commits that originated in
jacob_grimm/body

with merge bubbles Make it easy to determine the commits
that originated in jacob_grimm/body

What is a merge bubble?

What is a merge bubble? We’ll see in a moment
:)

First, Jacob must undo the merge

Log as graph

Log as graph Find commit before merge

Log as graph Copy sha to clipboard

Reset Move HEAD back to commit

Reset Discard changes in commit

Paste sha from clipboard Reset

It worked!

Log as graph

As if merge never happened

Again, incorporate jacob_grimm/body into master !

And, this time create a merge bubble

Merge Incorporate jacob_grimm/body into master! and make a merge bubble

Branch to merge into master Merge

Do not use Fast-forward strategy Merge

Merge Do not use Fast-forward strategy Create a merge bubble!

1 2 3 4 5 6 HEAD, master jacob_grimm/body

1 2 3 4 5 6 HEAD, master jacob_grimm/body Merge
commit 7

1 2 3 4 5 6 HEAD, master jacob_grimm/body 7

Merge Bubble

Originated from jacob_grimm/body

Merge with Recursive strategy

merge commit opens editor

auto populates merge commit message

save and close

It worked! Merge

Merged with recursive strategy Merge

Log as graph

Merge bubble Log as graph

Originated from jacob_grimm/body Log as graph

Made it easy to determine origin of commit

merge bubble == feature branch

HEAD and master are at commit Log as graph

Merge commit Log as graph HEAD and master are at
commit

Log as graph master has commits

master has commits Log as graph

jacob_grimm/body has commits Log as graph

jacob_grimm/body does NOT have merge commit Log as graph

Work Flow # 6 No Fast Forward merge strategy

Work Flow # 6 Use when merging feature branches No
Fast Forward merge strategy

Work Flow # 6 Use when merging feature branches Easily
determine from which feature branch a commit originated No Fast Forward merge strategy

What is Git? Create repo Basic workflow Understanding history Rebase
(interactive) Branches Merge Remotes Merge vs Rebase

Install Git! http://git-scm.com/book/en/v2/Getting-Started-Installing-Git http://kj-prince.com/code/install-git-mac-osx-homebrew/ Git Pro! http://git-scm.com/book/en/v2 Bash Completion! https://github.com/bobthecow/git-flow-completion/wiki/Install-Bash-git-completion
https://conra.dk/2013/01/18/git-on-osx.html Display git branch name in prompt! http://stackoverflow.com/questions/17333531/how-can-i-display-the-current- branch-and-folder-path-in-terminal Git Workflow Videos with Andy Lindeman! http://vimeo.com/33166064 http://vimeo.com/33165748 Well formed commit messages! http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html http://robots.thoughtbot.com/5-useful-tips-for-a-better-commit-message Resources

Git Micro Workflows: Little Red Riding Hood

Git Micro Workflows: Little Red Riding Hood

More Decks by Travis Douce

Other Decks in Technology

Featured

Transcript