Link
Embed
Share
Beginning
This slide
Copy link URL
Copy link URL
Copy iframe embed code
Copy iframe embed code
Copy javascript embed code
Copy javascript embed code
Share
Tweet
Share
Tweet
Slide 1
Slide 1 text
secrets Git GitHub &
Slide 2
Slide 2 text
No content
Slide 3
Slide 3 text
git branch -D local-branch git push origin :local-branch
Slide 4
Slide 4 text
Much like James Cameron’s Avatar™, Git doesn’t make any goddamn sense
Slide 5
Slide 5 text
This talk throws a ton of stuff at you
Slide 6
Slide 6 text
This talk throws a ton of stuff at you (Not unlike James Cameron’s Avatar™, btw)
Slide 7
Slide 7 text
Learn the bits that make you more productive
Slide 8
Slide 8 text
No content
Slide 9
Slide 9 text
Slide 10
Slide 10 text
secrets Git GitHub &
Slide 11
Slide 11 text
merge strategies
Slide 12
Slide 12 text
strategy defaults: one head: recursive multiple heads: octopus merge strategies
Slide 13
Slide 13 text
merge strategies git merge master -s strategy
Slide 14
Slide 14 text
git merge master -s ours merge strategies
Slide 15
Slide 15 text
git merge master -s ours “Give me master, but my final state should match my current branch” merge strategies
Slide 16
Slide 16 text
git merge master -s ours Great for when your long-running branch will supersede master merge strategies
Slide 17
Slide 17 text
git merge master \ -s recursive merge strategies
Slide 18
Slide 18 text
git merge master \ -s recursive -X patience merge strategies Be er line matching for logical groups
Slide 19
Slide 19 text
merge strategies — patience { :a => :b }
Slide 20
Slide 20 text
{ :a => :b } { :c => :d } merge strategies — patience
Slide 21
Slide 21 text
{ :a => :b +} + +{ + :c => :d } merge strategies — patience
Slide 22
Slide 22 text
{ :a => :b } +{ + :c => :d +} merge strategies — patience
Slide 23
Slide 23 text
git merge master \ -s recursive -X patience merge strategies Can also set as a global option
Slide 24
Slide 24 text
merge strategies › man git-merge # look at “Merge Strategies”
Slide 25
Slide 25 text
The second-order-diff trick
Slide 26
Slide 26 text
the second-order-diff trick Tom Moertel ( cl.ly/QNaG )
Slide 27
Slide 27 text
the second-order-diff trick Goal: transform strings with a regex in project
Slide 28
Slide 28 text
the second-order-diff trick Approach: re-run git diff and git reset until the regex is correct
Slide 29
Slide 29 text
the second-order-diff trick Problem: it sucks to review the diff each time
Slide 30
Slide 30 text
the second-order-diff trick Solution: stash, then diff against stash{0}
Slide 31
Slide 31 text
the second-order-diff trick › git status # clean
Slide 32
Slide 32 text
the second-order-diff trick › ./run-regex-script
Slide 33
Slide 33 text
the second-order-diff trick › git diff # review and check output
Slide 34
Slide 34 text
the second-order-diff trick › git stash # stash your reviewed diff
Slide 35
Slide 35 text
the second-order-diff trick › ./run-regex-script
Slide 36
Slide 36 text
the second-order-diff trick › git diff stash{0} # only incremental changes
Slide 37
Slide 37 text
the second-order-diff trick Find and replace in projects without worrying
Slide 38
Slide 38 text
emoji diffs
Slide 39
Slide 39 text
emoji diffs Yeah this is important
Slide 40
Slide 40 text
emoji diffs Git diffs unicode poorly:
Slide 41
Slide 41 text
emoji diffs
Slide 42
Slide 42 text
emoji diffs Git uses less as its pager
Slide 43
Slide 43 text
emoji diffs git --no-pager diff
Slide 44
Slide 44 text
emoji diffs
Slide 45
Slide 45 text
emoji diffs
Slide 46
Slide 46 text
emoji diffs
Slide 47
Slide 47 text
emoji diffs
Slide 48
Slide 48 text
git stripspace
Slide 49
Slide 49 text
git stripspace Fixes horrible coworkers and contributors
Slide 50
Slide 50 text
git stripspace Strips trailing whitespace, collapses newlines, adds a final newline
Slide 51
Slide 51 text
git stripspace git stripspace < file
Slide 52
Slide 52 text
git stripspace echo “hi \n” | git stripspace
Slide 53
Slide 53 text
git stripspace Run this in your editor a er file saves
Slide 54
Slide 54 text
git diff --check
Slide 55
Slide 55 text
git diff --check Fixes horrible you.
Slide 56
Slide 56 text
run.sh:1: trailing whitespace. +echo “hi” . git diff --check
Slide 57
Slide 57 text
run.sh:1: space before tab in indent. + ls -la git diff --check
Slide 58
Slide 58 text
git diff --cached
Slide 59
Slide 59 text
git diff --cached git diff only diffs unstaged changes
Slide 60
Slide 60 text
git diff --cached Shows staged (but uncommi ed) changes
Slide 61
Slide 61 text
HOT, HOT, TRIVIA BREAK
Slide 62
Slide 62 text
Which of these commit messages actually happened on GitHub?
Slide 63
Slide 63 text
1. A reasoned argument, citing sources 2. A 500MB db dump
Slide 64
Slide 64 text
1. A reasoned argument, citing sources 2. A 500MB db dump
Slide 65
Slide 65 text
“Why is my repository slow?”
Slide 66
Slide 66 text
git merge --abort
Slide 67
Slide 67 text
git merge --abort Aborts a conflicted merge
Slide 68
Slide 68 text
git merge --abort Resets your tree
Slide 69
Slide 69 text
git merge -m “message”
Slide 70
Slide 70 text
git merge -m Like commit -m but populates the merge commit
Slide 71
Slide 71 text
git merge --no-commit
Slide 72
Slide 72 text
git merge --no-commit Merges without a commit message
Slide 73
Slide 73 text
git status --ignored
Slide 74
Slide 74 text
git status --ignored Shows the status of everything you’re ignoring
Slide 75
Slide 75 text
--assume-unchanged
Slide 76
Slide 76 text
--assume-unchanged Temporarily ignore a file
Slide 77
Slide 77 text
--assume-unchanged git update-index \ --assume-unchanged \ path_to_file
Slide 78
Slide 78 text
--assume-unchanged git update-index \ --no-assume-unchanged \ path_to_file
Slide 79
Slide 79 text
proper messages
Slide 80
Slide 80 text
proper messages Linus has thoughts on your commit messages
Slide 81
Slide 81 text
proper messages git commit -m “fixes shit”
Slide 82
Slide 82 text
proper messages git commit -m “fixes shit” is not what he had in mind
Slide 83
Slide 83 text
proper messages A good commit has:
Slide 84
Slide 84 text
proper messages Short summary (title) A longer description of the change follows.
Slide 85
Slide 85 text
proper messages Short summary (title) < 50c
Slide 86
Slide 86 text
proper messages Short summary (title) A longer description of the change follows. < 50c
Slide 87
Slide 87 text
proper messages Short summary (title) A longer description of the change follows. < 50c wrap at 72c
Slide 88
Slide 88 text
proper messages
Slide 89
Slide 89 text
proper messages git-commit helps you write perfect messages
Slide 90
Slide 90 text
proper messages
Slide 91
Slide 91 text
proper messages 50c
Slide 92
Slide 92 text
proper messages
Slide 93
Slide 93 text
proper messages wraps at 72c
Slide 94
Slide 94 text
proper messages Assumes your $EDITOR is vim
Slide 95
Slide 95 text
proper messages export EDITOR=vim
Slide 96
Slide 96 text
proper messages Assumes you have syntax highlighting on
Slide 97
Slide 97 text
proper messages syntax on ~/.vimrc
Slide 98
Slide 98 text
proper messages Assumes you have plugin indenting on
Slide 99
Slide 99 text
proper messages filetype indent plugin on ~/.vimrc
Slide 100
Slide 100 text
secrets Git GitHub &
Slide 101
Slide 101 text
canonical URLs
Slide 102
Slide 102 text
No content
Slide 103
Slide 103 text
No content
Slide 104
Slide 104 text
y press
Slide 105
Slide 105 text
press y
Slide 106
Slide 106 text
y This page won’t change, even if the branch does
Slide 107
Slide 107 text
curlable public keys
Slide 108
Slide 108 text
h ps:/ / /holman.keys
Slide 109
Slide 109 text
Plaintext, non-authed access to public keys /user.keys
Slide 110
Slide 110 text
Programmatically add SSH keys /user.keys
Slide 111
Slide 111 text
fetching pulls
Slide 112
Slide 112 text
fetching pulls Accepting a Pull Request: Add a remote, fetch branch, merge
Slide 113
Slide 113 text
fetching pulls Lots of boring commands
Slide 114
Slide 114 text
fetching pulls GitHub stores all Pull Requests in your repository
Slide 115
Slide 115 text
fetching pulls This means we can track code even if the fork is deleted
Slide 116
Slide 116 text
fetching pulls You can abuse this, too!
Slide 117
Slide 117 text
fetching pulls git fetch origin pull/id/head:name
Slide 118
Slide 118 text
fetching pulls git fetch origin pull/12/head:pr
Slide 119
Slide 119 text
fetching pulls git fetch origin pull/12/head:pr fetches Pull Request #12 into a branch named “pr”
Slide 120
Slide 120 text
fetching pulls Automate this within helper scripts or an alias
Slide 121
Slide 121 text
live updates
Slide 122
Slide 122 text
No content
Slide 123
Slide 123 text
No content
Slide 124
Slide 124 text
No content
Slide 125
Slide 125 text
No content
Slide 126
Slide 126 text
HOT, HOT, TRIVIA BREAK
Slide 127
Slide 127 text
Most frequent Emoji used on GitHub:
Slide 128
Slide 128 text
#5 :clap:
Slide 129
Slide 129 text
#4 :+1:
Slide 130
Slide 130 text
#3 :-1:
Slide 131
Slide 131 text
#2 :sparkles:
Slide 132
Slide 132 text
#1 :shipit:
Slide 133
Slide 133 text
quick quotes
Slide 134
Slide 134 text
quick quotes Markdown uses . for blockquotes >
Slide 135
Slide 135 text
quick quotes
Slide 136
Slide 136 text
quick quotes r Highlight and press .
Slide 137
Slide 137 text
quick quotes
Slide 138
Slide 138 text
quick quotes
Slide 139
Slide 139 text
browse stars
Slide 140
Slide 140 text
h p:/ / /stars / brianmario
Slide 141
Slide 141 text
No content
Slide 142
Slide 142 text
web flow
Slide 143
Slide 143 text
web flow You can do a lot without leaving the browser
Slide 144
Slide 144 text
web flow Documentation, prose, quick fixes, switching away from nosql
Slide 145
Slide 145 text
web flow
Slide 146
Slide 146 text
web flow
Slide 147
Slide 147 text
web flow
Slide 148
Slide 148 text
web flow
Slide 149
Slide 149 text
web flow
Slide 150
Slide 150 text
web flow
Slide 151
Slide 151 text
web flow Frees you from git clone
Slide 152
Slide 152 text
issue autocomplete
Slide 153
Slide 153 text
issue autocomplete Type , get a search #
Slide 154
Slide 154 text
No content
Slide 155
Slide 155 text
No content
Slide 156
Slide 156 text
No content
Slide 157
Slide 157 text
No content
Slide 158
Slide 158 text
repo redirects
Slide 159
Slide 159 text
repo redirects Rename your repository and GitHub will redirect old URLs
Slide 160
Slide 160 text
in-repo licensing
Slide 161
Slide 161 text
No content
Slide 162
Slide 162 text
in-repo licensing You can add licenses to existing repos, too
Slide 163
Slide 163 text
in-repo licensing
Slide 164
Slide 164 text
in-repo licensing
Slide 165
Slide 165 text
in-repo licensing (also works for .gitignore)
Slide 166
Slide 166 text
file finder
Slide 167
Slide 167 text
file finder Type , find in project t
Slide 168
Slide 168 text
file finder
Slide 169
Slide 169 text
task lists
Slide 170
Slide 170 text
task lists Use issues and pulls as todo lists
Slide 171
Slide 171 text
task lists - [ ] Use NoSQL - [ ] Use today's trendiest language - [ ] Do what our VC tells us - [ ] Comment on Hacker News - [ ] Profit
Slide 172
Slide 172 text
task lists
Slide 173
Slide 173 text
task lists
Slide 174
Slide 174 text
task lists - [x] Use NoSQL - [x] Use today's trendiest language - [x] Do what our VC tells us - [x] Comment on Hacker News - [ ] Profit
Slide 175
Slide 175 text
task lists
Slide 176
Slide 176 text
fork URLs
Slide 177
Slide 177 text
fork URLs
Slide 178
Slide 178 text
No content
Slide 179
Slide 179 text
fork URLs h ps:/ / /user / repo / fork
Slide 180
Slide 180 text
No content
Slide 181
Slide 181 text
fork URLs README links
Slide 182
Slide 182 text
fork URLs
Slide 183
Slide 183 text
Remember:
Slide 184
Slide 184 text
Git is probably terrible
Slide 185
Slide 185 text
But it’s also neato
Slide 186
Slide 186 text
Thanks!