Understanding git - Speaker Deck

Slide 1

Slide 1 text

No content

Slide 2

Slide 2 text

Today’s topics

Slide 3

Slide 3 text

Today’s topics The basics of commit  git add, commit, revert, reset How to move in a git tree  git checkout, HEAD References  git branch, tag, merge History manipulation  git cherry-pick, git rebase (—interactive) Working with a remote server  git clone, remote, push, pull, fetch, merge, rebase

Slide 4

Slide 4 text

Requirement Before using Git, make sure you correctly conﬁgured your user: git config --global user.name "Matthieu Moquet"  git config --global user.email [email protected] write in your global ~/.gitconfig Your real name

Slide 5

Slide 5 text

What is Git? Git is a distributed version control system. It works by creating local snapshots of all your ﬁles, like a big copy/paste, but better optimized.

Slide 6

Slide 6 text

src/ Foobar.php Baz.php README.md src/ Foobar.php Baz.php README.md Workspace

Slide 7

Slide 7 text

src/ Foobar.php Baz.php README.md abcdef234 Initial commit Workspace

Slide 8

Slide 8 text

src/ Foobar.php Baz.php README.md New.php src/ Foobar.php Baz.php README.md New.php abcdef234 Initial commit Workspace

Slide 9

Slide 9 text

src/ Foobar.php Baz.php README.md New.php deadbeef42 A new ﬁle abcdef234 Initial commit Workspace

Slide 10

Slide 10 text

src/ Foobar.php Baz.php README.md New.php src/ Foobar.php Baz.php README.md New.php abcdef234 Initial commit deadbeef42 A new ﬁle Workspace

Slide 11

Slide 11 text

src/ Foobar.php Baz.php README.md New.php fear8342abc Update foobar abcdef234 Initial commit deadb33f42 A new ﬁle Workspace internally it only stores the deltas between commits

Slide 12

Slide 12 text

fear8342abc Update foobar abcdef234 Initial commit deadb33f42 A new ﬁle a commit: • is a snapshot of the sources • is identiﬁed by its hash (sha1) • has one (or many) parents • is immutable git commit once a commit is done, you can NOT modify it!

Slide 13

Slide 13 text

How to commit?

Slide 14

Slide 14 text

How to commit? Workspace Staging area Commit git add file.txt

Slide 15

Slide 15 text

How to commit? Workspace Staging area Commit git add file.txt git commit

Slide 16

Slide 16 text

How to commit? Workspace Staging area Commit git add file.txt git commit

Slide 17

Slide 17 text

➜ git init ➜ vim README.md ➜ git status ➜ git add README.md ➜ git commit ➜ git status Initialized empty Git repository in /path/to/myproject/.git/ Untracked files: (use "git add ..." to include in what will be committed) ! README.md Changes to be committed: (use "git reset HEAD ..." to unstage) ! new file: README.md [master (root-commit) 4b60dee] My commit ➜ git status On branch master nothing to commit, working directory clean

Slide 18

Slide 18 text

➜ git commit -A -m "Your commit message" Shortcut git add ALL FILES inline commit message

Slide 19

Slide 19 text

Best practice ➜ git add -p diff --git a/README.md b/README.md index 540550a..2f10d41 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -This is an old line +This is the new line Stage this hunk [y,n,q,a,d,/,e,?]? y diff --git a/src/Foobar.php b/src/Foobar.php index 540550a..2f10d41 100644 --- a/src/Foobar.php +++ b/src/Foobar.php @@ -1 +1 @@ -class Foobar -{ - const BAZ = 'world'; -} Stage this hunk [y,n,q,a,d,/,e,?]? git add patch

Slide 20

Slide 20 text

➜ git commit Capitalized, short (50 chars or less) summary ! More detailed explanatory text, if necessary. Wrap it to about 72 characters or so. In some contexts, the first line is treated as the subject of an email and the rest of the text as the body. The blank line separating the summary from the body is critical (unless you omit the body entirely); tools like rebase can get confused if you run the two together. ! Write your commit message in the imperative: "Fix bug" and not "Fixed bug" or "Fixes bug." ! - Bullet points are okay, too - Use a hanging indent Best practice Open in your editor http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

Slide 21

Slide 21 text

Best practice commit 9342a5bf855042b29a2ebd3413ce8e6cfb65557f Author: Matthieu Moquet Date: Thu Sep 18 13:37:00 2014 +0200 ! Allow scope to be defined in the request entity body ! As defined in the RFC 6749: http://tools.ietf.org/html/rfc6749#section-4.4.2 ! Note that this change is backward compatible as it will first look up the request query.

Slide 22

Slide 22 text

Best practice commit c1230da7409d22fe78263da777da237e9fc702d4 Author: Matthieu Moquet Date: Tue Jul 29 17:00:33 2014 +0200 ! Use UserChecker in OAuth2 listener ! In order to deny block users on every API call ! Fix https://jira.example.net/browse/FOO-123

Slide 23

Slide 23 text

How to display the diff between commits?

Slide 24

Slide 24 text

git show abcdef Display the commit message + the diff with the previous one git diff abcdef dfebca Display the diff between the two commits git diff abcd~ abcd How to display the diff between commits?

Slide 25

Slide 25 text

git diff --staged Display the change put in the staging area git diff Display the file I changed but not committed/staged How to display the diff between commits?

Slide 26

Slide 26 text

Remember when I said a commit is immutable?

Slide 27

Slide 27 text

What if I made a mistake and want to rollback the committed code?

Slide 28

Slide 28 text

Case #1 I made a typo on my previous commit, let’s fix it quickly

Slide 29

Slide 29 text

git commit --amend Replace previous commit with new one, using the staging area git commit Oops, I made a mistake (typo, forget file, wrong commit msg) git add the_file.txt Add the concerned file into the staging area

Slide 30

Slide 30 text

Case #2 I want to remove the previous commit

Slide 31

Slide 31 text

git commit Meh, I shouldn’t have committed git reset HEAD~ Cancel the commit, but keep the change locally, so you can create another one git reset --hard HEAD~ Cancel the commit, and remove all the change

Slide 32

Slide 32 text

Case #3 I need to revert one or several commits already pushed into production

Slide 33

Slide 33 text

git commit Later: oops this commit (abc123) breaks something git revert abc123 Create a new commit, which is the opposite of the given one

Slide 34

Slide 34 text

demo

Slide 35

Slide 35 text

git log

Slide 36

Slide 36 text

git log master HEAD fear8342abc Update foobar abcdef234 Initial commit deadb33f42 A new ﬁle Helps you to visualize the git tree start from a given commit… …and follow the parents to go through the history

Slide 37

Slide 37 text

commit 9342a5bf855042b29a2ebd3413ce8e6cfb65557f Author: Matthieu Moquet Date: Thu Sep 18 13:37:00 2014 +0200 ! Allow scope to be defined in the request entity body ! As defined in the RFC 6749: http://tools.ietf.org/html/rfc6749#section-4.4.2 ! Note that this change is backward compatible as it will first look up the request query. ! commit c851bca7bf85504fe82639342acb237e9fc87420 Author: Matthieu Moquet Date: Tue Jul 30 12:34:56 2014 +0200 ! Update README.md ! commit c1230da7409d22fe78263da777da237e9fc702d4 Author: Matthieu Moquet Date: Tue Jul 29 17:00:33 2014 +0200 ! Use UserChecker in OAuth2 listener ! In order to deny block users on every API call ! Fix https://jira.example.net/browse/FOO-123 git log

Slide 38

Slide 38 text

[alias] lg = log --graph --abbrev-commit --date=relative \ --pretty=tformat:'%Cred%h%Creset -... %s %Cgreen(%an %cr)%Creset' git log Shortcut

Slide 39

Slide 39 text

* 1187cf9 - (HEAD, master) Merge branch ‘update-ui' (Matthieu Moquet 2 hours ago) |\ | * 3b1ba4e - Compile assets via Gulp (Matthieu Moquet 2 hours ago) | * 90575d5 - Fix layout login dependency (Matthieu Moquet 2 hours ago) | * a151f92 - Update editor shortcuts (Matthieu Moquet 2 hours ago) |/ * 56fa6f3 - Merge branch 'project-page' (Matthieu Moquet 3 hours ago) |\ | * 2ee4b97 - Add inLocale parameter to project page (Matthieu Moquet 4 hours ago) | * 73b044f - Update navbar user menu UI (Matthieu Moquet 4 hours ago) | * 6faa5c3 - Rework project page (Matthieu Moquet 6 hours ago) |/ * 0309542 - Merge branch 'rework-model' (Matthieu Moquet 30 hours ago) |\ | * 0082ea5 - Fix duplicate key error on import processor (Matthieu Moquet 2 days ago) | * 8dab5be - Add options parameters for export api (Matthieu Moquet 2 days ago) | * 0649be9 - Warmup symfony cache in Travis build (Matthieu Moquet 2 days ago) | * 6c72e8e - Refactor app architecture (Matthieu Moquet 2 days ago) |/ * 77cb4c9 - Remove old scripts (Matthieu Moquet 4 days ago) * ... * * git lg

Slide 40

Slide 40 text

git checkout HEAD

Slide 41

Slide 41 text

git checkout master fear8342abc Update foobar abcdef234 Initial commit deadb33f42 A new ﬁle Workspace ➜ git checkout abcdef234 HEAD

Slide 42

Slide 42 text

git checkout master HEAD fear8342abc Update foobar abcdef234 Initial commit deadb33f42 A new ﬁle Workspace copy ﬁles

Slide 43

Slide 43 text

src/ Foobar.php Baz.php README.md New.php fear8342abc Update foobar abcdef234 Initial commit deadb33f42 A new ﬁle Workspace HEAD

Slide 44

Slide 44 text

src/ Foobar.php Baz.php README.md New.php fear8342abc Update foobar abcdef234 Initial commit deadb33f42 A new ﬁle Workspace HEAD

Slide 45

Slide 45 text

Workspace src/ Foobar.php Baz.php README.md fear8342abc Update foobar abcdef234 Initial commit deadb33f42 A new ﬁle HEAD

Slide 46

Slide 46 text

git checkout abcd1234 -- file.txt Copy the file.txt from abcd1234 to local workspace

Slide 47

Slide 47 text

git checkout HEAD -- file.txt Cancel the changes of file.txt git checkout file.txt

Slide 48

Slide 48 text

Branches

Slide 49

Slide 49 text

Branches master HEAD fear8342abc Update foobar abcdef234 Initial commit deadb33f42 A new ﬁle A branch is just a pointer to a commit foobar ➜ git branch foobar deadb33f42

Slide 50

Slide 50 text

Branches Internally a branch is simply a reference in a file ➜ cat .git/refs/heads/foobar deadb33f42d89b21f72f8115e34ad23c507db8b6 ➜ cat .git/HEAD ref: refs/heads/foobar So does HEAD ➜ cat .git/HEAD deadb33f42d89b21f72f8115e34ad23c507db8b6 git checkout foobar git checkout deadb33f42

Slide 51

Slide 51 text

Branches When committing, the reference pointed by the HEAD is moved to the new commit master HEAD abcdef234 Initial commit deadb33f42 A new ﬁle

Slide 52

Slide 52 text

Branches When committing, the reference pointed by the HEAD is moved to the new commit master HEAD fear8342abc Update foobar abcdef234 Initial commit deadb33f42 A new ﬁle

Slide 53

Slide 53 text

Branches If HEAD points to a commit (and not a branch), then no branch will be updated master abcdef234 Initial commit deadb33f42 A new ﬁle HEAD

Slide 54

Slide 54 text

Branches master HEAD fear8342abc Update foobar abcdef234 Initial commit deadb33f42 A new ﬁle If HEAD points to a commit (and not a branch), then no branch will be updated orphan commit, no branch is referencing it

Slide 55

Slide 55 text

Shortcut Create a new branch and checkout it immediately. ➜ git branch foobar ; git checkout foobar ➜ git checkout -b foobar

Slide 56

Slide 56 text

demo

Slide 57

Slide 57 text

Merges Branches are useful when you’re working on a new feature. Once the feature is done you want it to be merged into the master branch.

Slide 58

Slide 58 text

foobar HEAD master ➜ git merge foobar Divergence —> create new commit

Slide 59

Slide 59 text

foobar HEAD master ➜ git merge foobar Divergence —> create new commit

Slide 60

Slide 60 text

foobar HEAD master ➜ git merge foobar No divergence —> Fast Forward

Slide 61

Slide 61 text

foobar HEAD master ➜ git merge foobar No divergence —> Fast Forward

Slide 62

Slide 62 text

foobar HEAD master ➜ git merge foobar --no-ff Force no Fast Forward

Slide 63

Slide 63 text

foobar HEAD master ➜ git merge foobar --no-ff Force no Fast Forward

Slide 64

Slide 64 text

History manipulation

Slide 65

Slide 65 text

Merge Hell

Slide 66

Slide 66 text

Slide 67

Slide 67 text

Better (no fast-forward)

Slide 68

Slide 68 text

HEAD master Understanding cherry-pick foobar Cherry-pick make a copy of a given commit

Slide 69

Slide 69 text

HEAD master Understanding cherry-pick ➜ git cherry-pick foobar~ foobar

Slide 70

Slide 70 text

HEAD master foobar Understanding cherry-pick ➜ git cherry-pick foobar

Slide 71

Slide 71 text

HEAD master foobar Understanding cherry-pick ➜ git branch -D foobar

Slide 72

Slide 72 text

HEAD master Understanding cherry-pick

Slide 73

Slide 73 text

Let’s automatize with Rebase

Slide 74

Slide 74 text

HEAD master Let’s automatize with Rebase ➜ git rebase master foobar

Slide 75

Slide 75 text

HEAD master Let’s automatize with Rebase foobar ➜ git rebase master

Slide 76

Slide 76 text

master Let’s automatize with Rebase foobar HEAD ➜ git rebase master

Slide 77

Slide 77 text

master Let’s automatize with Rebase foobar HEAD ➜ git rebase master

Slide 78

Slide 78 text

HEAD master Let’s automatize with Rebase foobar ➜ git merge --no-ff foobar master

Slide 79

Slide 79 text

HEAD master Let’s automatize with Rebase foobar ➜ git merge --no-ff foobar master

Slide 80

Slide 80 text

Interactive Rebase

Slide 81

Slide 81 text

HEAD master Interactive Rebase ➜ git rebase -i master foobar pick 1df2b98 My green commit pick 3b7aff0 My yellow commit pick 2edf2b8 My purple commit

Slide 82

Slide 82 text

HEAD master Interactive Rebase ➜ git rebase -i master foobar pick 1df2b98 My green commit pick 3b7aff0 My yellow commit pick 2edf2b8 My purple commit

Slide 83

Slide 83 text

HEAD master Interactive Rebase ➜ git rebase -i master foobar

Slide 84

Slide 84 text

master Interactive Rebase ➜ git rebase -i master foobar HEAD

Slide 85

Slide 85 text

master Interactive Rebase ➜ git rebase -i master foobar HEAD

Slide 86

Slide 86 text

master Interactive Rebase ➜ git rebase -i master foobar HEAD

Slide 87

Slide 87 text

HEAD master Interactive Rebase ➜ git rebase -i master foobar pick 1df2b98 My green commit pick 2edf2b8 My purple commit pick 3b7aff0 My yellow commit

Slide 88

Slide 88 text

HEAD master Interactive Rebase ➜ git rebase -i master foobar pick 1df2b98 My green commit squash 2edf2b8 My purple commit pick 3b7aff0 My yellow commit

Slide 89

Slide 89 text

HEAD master Interactive Rebase ➜ git rebase -i master foobar

Slide 90

Slide 90 text

master Interactive Rebase ➜ git rebase -i master foobar HEAD

Slide 91

Slide 91 text

master Interactive Rebase ➜ git rebase -i master foobar HEAD

Slide 92

Slide 92 text

master Interactive Rebase ➜ git rebase -i master foobar HEAD

Slide 93

Slide 93 text

master Interactive Rebase ➜ git rebase -i master foobar HEAD

Slide 94

Slide 94 text

Interactive Rebase # Commands: # p, pick = use commit # r, reword = use commit, but edit the commit message # e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # f, fixup = like "squash", but discard this commit's log message # x, exec = run command (the rest of the line) using shell

Slide 95

Slide 95 text

demo

Slide 96

Slide 96 text

Working with a remote server

Slide 97

Slide 97 text

origin/master origin/foobar Working with a remote server git clone [email protected] master foobar

Slide 98

Slide 98 text

Working with a remote server origin/master master origin/foobar master foobar

Slide 99

Slide 99 text

Updating your local copy of remote branches origin/master master origin/foobar master foobar git fetch When the branch is updated on the server, you have to synchronize you local copy

Slide 100

Slide 100 text

Updating your local copy of remote branches origin/master master origin/foobar master foobar git fetch fetch will only update the origin/* branches

Slide 101

Slide 101 text

Updating your local branch fast-forward master master origin/master

Slide 102

Slide 102 text

master master origin/master git fetch Updating your local branch fast-forward

Slide 103

Slide 103 text

master master origin/master git fetch Updating your local branch fast-forward

Slide 104

Slide 104 text

master master origin/master git merge origin/master master Updating your local branch fast-forward

Slide 105

Slide 105 text

master master origin/master Updating your local branch fast-forward

Slide 106

Slide 106 text

Shortcut: git pull git pull origin master == git fetch origin ; git merge origin/master

Slide 107

Slide 107 text

Protip Never use git pull, except for master branch* *because you’re not supposed to have divergence with master

Slide 108

Slide 108 text

master origin/master Updating your local branch with divergence master

Slide 109

Slide 109 text

origin/master Updating your local branch with divergence master master someone have added commits into master

Slide 110

Slide 110 text

master origin/master Updating your local branch with divergence master me too git fetch

Slide 111

Slide 111 text

origin/master Updating your local branch with divergence master master git merge origin/master master

Slide 112

Slide 112 text

origin/master Updating your local branch with divergence master master Way to Merge-Hell (even with a single branch)

Slide 113

Slide 113 text

origin/master Updating your local branch with divergence master master git rebase origin/master

Slide 114

Slide 114 text

origin/master Updating your local branch with divergence master master

Slide 115

Slide 115 text

origin/master Updating your local branch with divergence master master git push origin master

Slide 116

Slide 116 text

origin/master Updating your local branch with divergence master master

Slide 117

Slide 117 text

Never use git pull. Instead do git fetch + git rebase or git pull --rebase

Slide 118

Slide 118 text

Basic Git Workflow

Slide 119

Slide 119 text

Master Initially we only have one master branch Basic Git Workflow

Slide 120

Slide 120 text

Master Branch We create a new branch to start a new feature Basic Git Workflow

Slide 121

Slide 121 text

Master Branch Once the feature done, we merge it into master Basic Git Workflow

Slide 122

Slide 122 text

Master Then we can safely delete the branch Basic Git Workflow

Slide 123

Slide 123 text

master master origin/master Basic Git Workflow ➜ git chekcout -b dev ➜ git commit; git commit

Slide 124

Slide 124 text

master master dev origin/master Basic Git Workflow ➜ git push origin dev

Slide 125

Slide 125 text

master master dev origin/master Basic Git Workflow dev origin/dev Meanwhile, master have been updated…

Slide 126

Slide 126 text

master master dev origin/master Basic Git Workflow dev origin/dev ➜ git fetch

Slide 127

Slide 127 text

master master origin/master Basic Git Workflow dev origin/dev dev ➜ git rebase origin/master

Slide 128

Slide 128 text

master master origin/master Basic Git Workflow dev origin/dev dev

Slide 129

Slide 129 text

master master origin/master Basic Git Workflow dev origin/dev dev git push origin dev Server will reject the push because of the divergence

Slide 130

Slide 130 text

master master origin/master Basic Git Workflow dev origin/dev dev git push -f origin dev Say the server to forget its old commits Use with caution if several people work on that branch

Slide 131

Slide 131 text

master master origin/master Basic Git Workflow origin/dev dev git push -f origin dev dev

Slide 132

Slide 132 text

master master origin/master Basic Git Workflow origin/dev dev dev ➜ git merge --no-ff dev master

Slide 133

Slide 133 text

master master origin/master Basic Git Workflow origin/dev dev Merged with Stash (non fast-forward)

Slide 134

Slide 134 text

master master origin/master Basic Git Workflow origin/dev dev Prune option delete removed origin/* branches ➜ git fetch -p

Slide 135

Slide 135 text

master master origin/master Basic Git Workflow dev ➜ git checkout master ! ➜ git merge origin/master or ➜ git pull

Slide 136

Slide 136 text

master origin/master Basic Git Workflow dev master ➜ git branch -d dev

Slide 137

Slide 137 text

master origin/master Basic Git Workflow master

Slide 138

Slide 138 text

TL;DR

Slide 139

Slide 139 text

➜ git:(master) git pull # ensure your master is up to date Updating 7afe47a..fb562e8 Fast-forward ➜ git:(master) git checkout -b feat-something-1234 # start new branch ➜ git:(feat-something-1234) vim files ; git add -p ; git commit # commit code Switched to a new branch 'feat-something-1234' ➜ git:(feat-something-1234) git push -u origin feat-something-1234 To ssh://git@server/path/to/project.git + fb562e8...4b60dee feat-something-1234 -> feat-something-1234 [feat-something-1234 4b60dee] Some commit message ➜ git:(feat-something-1234) git rebase origin/master # update your branch First, rewinding head to replay your work on top of it... Applying: Some commit message ➜ git:(feat-something-1234) git fetch -p # later, before merging ➜ git:(feat-something-1234) git push -f # push force To ssh://git@server/path/to/project.git + fb562e8...4b60dee feat-something-1234 -> feat-something-1234 (force update) ➜ git:(feat-something-1234) stash pull-request master # open a PR ➜ git:(feat-something-1234) meps deploy # deploy on maquette

Slide 140

Slide 140 text

Bonus

Slide 141

Slide 141 text

Push git push origin foobar:foobar Long command git push origin :foobar Deleting a remote branch branch name on the remote local branch name into the remote branch push nothing

Slide 142

Slide 142 text

Push git push -u origin foobar Track upstream branch (the first time you push it) git push Use the shortcut the next time [push] # git < v2.0 # 'nothing' : Do not push anything # 'matching' : Push all matching branches (default) # 'upstream' : Push the current branch to whatever it is tracking # 'current' : Push the current branch default = upstream

Slide 143

Slide 143 text

Push git push origin foobar:foobar Push into the branch with the same branch by default git push [push] # git >= v2.0 default = simple

Slide 144

Slide 144 text

Track untracked file git add -N . Useful because git add patch only works on tracked file git add -p

Slide 145

Slide 145 text

Rebase conflict HEAD master foobar Problem: sometimes it happens you have to resolves several times the same conflict while rebasing Solution: squash all your commits before rebasing on master

Slide 146

Slide 146 text

Rebase conflict HEAD master foobar conflicts (1) git rebase origin/master origin/master

Slide 147

Slide 147 text

Rebase conflict HEAD master foobar conflicts (2) origin/master

Slide 148

Slide 148 text

Rebase conflict HEAD master foobar conflicts (3) origin/master

Slide 149

Slide 149 text

Rebase conflict HEAD master foobar git rebase -i $(git merge-base master foobar) origin/master First rebase on yourself There won’t be any conflict here

Slide 150

Slide 150 text

Rebase conflict HEAD master foobar origin/master pick 1df2b98 My green commit squash 3b7aff0 My yellow commit squash 2edf2b8 My purple commit

Slide 151

Slide 151 text

Rebase conflict HEAD master origin/master

Slide 152

Slide 152 text

Rebase conflict master origin/master HEAD

Slide 153

Slide 153 text

Rebase conflict master origin/master HEAD

Slide 154

Slide 154 text

Rebase conflict master origin/master HEAD

Slide 155

Slide 155 text

Rebase conflict master origin/master HEAD

Slide 156

Slide 156 text

Rebase conflict master origin/master HEAD foobar

Slide 157

Slide 157 text

Rebase conflict master origin/master HEAD foobar git rebase origin/master Then you can rebase on master

Slide 158

Slide 158 text

Rebase conflict master origin/master HEAD foobar git rebase origin/master Resolve conflicts once

Slide 159

Slide 159 text

Rebase conflict $ (vim the file.txt with the conflict) $ git add file.txt $ git rebase --continue To resolve a rebase conflict $ git rebase --abort If you fucked up

Slide 160

Slide 160 text

Branch diff $ git diff origin/master...foobar Diff for a whole branch $ git diff --name-status origin/master... Only display changed files $ git lg origin/master..foobar Log of the branch

Slide 161

Slide 161 text

Branch naming feat-description-1234 feat-description-BBCTHREE-1234 fix-description-1234 Internal convention to name a branch

Slide 162

Slide 162 text

Git Stash git stash save "WIP something" Want to save your change, but don’t want to commit? git stash pop git stash list Try not to have too many thing in your stash, otherwise you will forgot it git stash show -p stash@{0}

Slide 163

Slide 163 text

(last) demo

Slide 164

Slide 164 text

http://git-scm.com/ https://try.github.io/ http://pcottle.github.io/learnGitBranching/ http://www.git-attitude.fr/2014/05/04/bien-utiliser-git-merge-et-rebase/ http://www.git-attitude.fr/2014/09/15/30-options-git-qui-gagnent-a-etre-connues/ Links