Tweet
Tweet

Slide 1

Slide 1 text

Little Red Riding Hood !

Slide 2

Slide 2 text

The Big Bad Ogre Little Red Riding Hood and

Slide 3

Slide 3 text

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

Slide 4

Slide 4 text

Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase

Slide 5

Slide 5 text

Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase

Slide 6

Slide 6 text

Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase

Slide 7

Slide 7 text

Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase

Slide 8

Slide 8 text

Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase

Slide 9

Slide 9 text

Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase

Slide 10

Slide 10 text

Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase

Slide 11

Slide 11 text

The Brothers Grimm Wilhelm Jacob

Slide 12

Slide 12 text

What is Git?

Slide 13

Slide 13 text

Create Repo

Slide 14

Slide 14 text

Create Repo

Slide 15

Slide 15 text

Create Repo

Slide 16

Slide 16 text

Create Repo

Slide 17

Slide 17 text

Create Repo

Slide 18

Slide 18 text

Create Repo

Slide 19

Slide 19 text

Create Repo

Slide 20

Slide 20 text

Create Repo

Slide 21

Slide 21 text

Create Repo

Slide 22

Slide 22 text

Create Repo

Slide 23

Slide 23 text

Add Color

Slide 24

Slide 24 text

Add Color

Slide 25

Slide 25 text

Add Color

Slide 26

Slide 26 text

Track File

Slide 27

Slide 27 text

Track File

Slide 28

Slide 28 text

Stage

Slide 29

Slide 29 text

Commit to repo

Slide 30

Slide 30 text

Commit to repo opens editor

Slide 31

Slide 31 text

commit message Commit to repo * See end of slides for writing great commit messages

Slide 32

Slide 32 text

save Commit to repo

Slide 33

Slide 33 text

Commit to repo

Slide 34

Slide 34 text

Commit to repo This means it worked!

Slide 35

Slide 35 text

Commit to repo

Slide 36

Slide 36 text

Commit to repo

Slide 37

Slide 37 text

Commit to repo

Slide 38

Slide 38 text

Let’s write our story

Slide 39

Slide 39 text

little_red_riding_hood.txt Edit File

Slide 40

Slide 40 text

Modified

Slide 41

Slide 41 text

Modified

Slide 42

Slide 42 text

Stage

Slide 43

Slide 43 text

Stage

Slide 44

Slide 44 text

Stage

Slide 45

Slide 45 text

Commit

Slide 46

Slide 46 text

Commit opens editor opens editor save opens editor

Slide 47

Slide 47 text

Commit opens editor opens editor save commit message

Slide 48

Slide 48 text

Commit opens editor opens editor save save

Slide 49

Slide 49 text

Commit

Slide 50

Slide 50 text

Commit

Slide 51

Slide 51 text

Commit

Slide 52

Slide 52 text

Modified Staged Committed Basic Workflow

Slide 53

Slide 53 text

Modified Staged Committed Basic Workflow

Slide 54

Slide 54 text

Modified Staged Committed Basic Workflow

Slide 55

Slide 55 text

Killer opening

Slide 56

Slide 56 text

save file Edit File little_red_riding_hood.txt

Slide 57

Slide 57 text

save file Edit File little_red_riding_hood.txt

Slide 58

Slide 58 text

Modified

Slide 59

Slide 59 text

Modified

Slide 60

Slide 60 text

Stage

Slide 61

Slide 61 text

Stage

Slide 62

Slide 62 text

Stage

Slide 63

Slide 63 text

Commit

Slide 64

Slide 64 text

Commit opens editor

Slide 65

Slide 65 text

Commit commit message

Slide 66

Slide 66 text

Commit save

Slide 67

Slide 67 text

Commit

Slide 68

Slide 68 text

Commit

Slide 69

Slide 69 text

Commit

Slide 70

Slide 70 text

Alias

Slide 71

Slide 71 text

Alias

Slide 72

Slide 72 text

Alias

Slide 73

Slide 73 text

History

Slide 74

Slide 74 text

As a log

Slide 75

Slide 75 text

As a log

Slide 76

Slide 76 text

As a log

Slide 77

Slide 77 text

As a log

Slide 78

Slide 78 text

As a log

Slide 79

Slide 79 text

sha

Slide 80

Slide 80 text

As a detailed log

Slide 81

Slide 81 text

As a detailed log

Slide 82

Slide 82 text

As a detailed log

Slide 83

Slide 83 text

As a detailed log

Slide 84

Slide 84 text

No content

Slide 85

Slide 85 text

little_red_riding_hood.txt Edit File

Slide 86

Slide 86 text

little_red_riding_hood.txt Edit File

Slide 87

Slide 87 text

Modified

Slide 88

Slide 88 text

Modified

Slide 89

Slide 89 text

Stage

Slide 90

Slide 90 text

Commit

Slide 91

Slide 91 text

opens editor

Slide 92

Slide 92 text

No content

Slide 93

Slide 93 text

No content

Slide 94

Slide 94 text

save

Slide 95

Slide 95 text

ALWAYS Verbose Commit

Slide 96

Slide 96 text

My Ugly History

Slide 97

Slide 97 text

As a graph *lg alias at end of slides

Slide 98

Slide 98 text

As a graph *lg alias at end of slides

Slide 99

Slide 99 text

As a graph

Slide 100

Slide 100 text

As a graph

Slide 101

Slide 101 text

As a graph

Slide 102

Slide 102 text

As a graph

Slide 103

Slide 103 text

What is HEAD? Parent of next commit

Slide 104

Slide 104 text

What is master? Default branch

Slide 105

Slide 105 text

What is master? Default branch

Slide 106

Slide 106 text

Re-write history

Slide 107

Slide 107 text

A prettier past

Slide 108

Slide 108 text

A prettier past

Slide 109

Slide 109 text

start rebasing at sha Rebase

Slide 110

Slide 110 text

copy to clipboard Rebase

Slide 111

Slide 111 text

Rebase

Slide 112

Slide 112 text

Rebase interactive

Slide 113

Slide 113 text

Rebase paste sha from clipboard

Slide 114

Slide 114 text

opens editor

Slide 115

Slide 115 text

No content

Slide 116

Slide 116 text

No content

Slide 117

Slide 117 text

No content

Slide 118

Slide 118 text

No content

Slide 119

Slide 119 text

No content

Slide 120

Slide 120 text

No content

Slide 121

Slide 121 text

No content

Slide 122

Slide 122 text

f

Slide 123

Slide 123 text

f save

Slide 124

Slide 124 text

Rebase

Slide 125

Slide 125 text

Rebase Success!

Slide 126

Slide 126 text

Rebase git rebase --abort

Slide 127

Slide 127 text

History as a graph

Slide 128

Slide 128 text

History as a graph

Slide 129

Slide 129 text

History as a graph

Slide 130

Slide 130 text

Rebase

Slide 131

Slide 131 text

Rebase different sha

Slide 132

Slide 132 text

History with details

Slide 133

Slide 133 text

History with details

Slide 134

Slide 134 text

It worked! History with details

Slide 135

Slide 135 text

Wilhelm Grimm Jealous

Slide 136

Slide 136 text

Wilhelm Grimm Jealous

Slide 137

Slide 137 text

Wilhelm Grimm Jealous

Slide 138

Slide 138 text

Remotes

Slide 139

Slide 139 text

Remotes

Slide 140

Slide 140 text

Create repo on remote (GitHub)

Slide 141

Slide 141 text

copy to clipboard Create repo on remote (GitHub)

Slide 142

Slide 142 text

Add remote (GitHub)

Slide 143

Slide 143 text

Add remote (GitHub) name we gave the remote

Slide 144

Slide 144 text

Add remote (GitHub) paste from clipboard

Slide 145

Slide 145 text

List remotes

Slide 146

Slide 146 text

List remotes

Slide 147

Slide 147 text

Push to remote (GitHub) move code from local to remote

Slide 148

Slide 148 text

name of remote (github) Push to remote (GitHub)

Slide 149

Slide 149 text

name of local branch Push to remote (GitHub)

Slide 150

Slide 150 text

Push to remote (GitHub)

Slide 151

Slide 151 text

Push to remote (GitHub) This means it worked!

Slide 152

Slide 152 text

remote (GitHub) most recent commit

Slide 153

Slide 153 text

Finish story

Slide 154

Slide 154 text

Modified

Slide 155

Slide 155 text

Modified

Slide 156

Slide 156 text

Stage

Slide 157

Slide 157 text

Commit with message Can supply message

Slide 158

Slide 158 text

Commit with message

Slide 159

Slide 159 text

Commit with message

Slide 160

Slide 160 text

Commit with message

Slide 161

Slide 161 text

The Big Bad Ogre Oct. Nov. Dec.

Slide 162

Slide 162 text

Feature branch name of branch

Slide 163

Slide 163 text

Feature branch authorFirstName_authorLastName/description_of_branch

Slide 164

Slide 164 text

Feature branch authorFirstName_authorLastName/description_of_branch

Slide 165

Slide 165 text

Feature branch authorFirstName_authorLastName/description_of_branch

Slide 166

Slide 166 text

Feature branch authorFirstName_authorLastName/description_of_branch

Slide 167

Slide 167 text

Feature branch authorFirstName_authorLastName/description_of_branch

Slide 168

Slide 168 text

Feature branch

Slide 169

Slide 169 text

What branch am I on?

Slide 170

Slide 170 text

What branch am I on?

Slide 171

Slide 171 text

* bash script at end of slides Display branch in prompt

Slide 172

Slide 172 text

Display branch in prompt

Slide 173

Slide 173 text

History as a graph

Slide 174

Slide 174 text

History as a graph

Slide 175

Slide 175 text

History as a graph HEAD is at this commit

Slide 176

Slide 176 text

History as a graph HEAD is at this commit Parent of next commit

Slide 177

Slide 177 text

History as a graph origin/master is at this commit! (master on GitHub)

Slide 178

Slide 178 text

History as a graph master is at this commit! (local)

Slide 179

Slide 179 text

History as a graph jacob_grimm/big_bad_ogre is at this commit! (local)!

Slide 180

Slide 180 text

the long running branch The Big Bad Ogre, Oct. Nov. Dec.

Slide 181

Slide 181 text

the long running branch The Big Bad Ogre, Oct. Nov. Dec.

Slide 182

Slide 182 text

the long running branch The Big Bad Ogre, Oct. Nov. Dec.

Slide 183

Slide 183 text

the long running branch The Big Bad Ogre, Oct. Nov. Dec. Replaces ‘wolf’ with ‘ogre’

Slide 184

Slide 184 text

Wilhelm has made changes to origin/master In the meantime

Slide 185

Slide 185 text

origin/master on remote (GitHub)

Slide 186

Slide 186 text

Update master with origin/master

Slide 187

Slide 187 text

Update master with origin/master

Slide 188

Slide 188 text

move code from remote to local Update master with origin/master

Slide 189

Slide 189 text

name of remote! (github) Update master with origin/master

Slide 190

Slide 190 text

name of branch Update master with origin/master

Slide 191

Slide 191 text

Update master with origin/master

Slide 192

Slide 192 text

This means it worked! Update master with origin/master

Slide 193

Slide 193 text

Understanding history as a graph Parent of next commit

Slide 194

Slide 194 text

Understanding history as a graph

Slide 195

Slide 195 text

jacob_grimm/big_bad_ogre and ! origin/master and master have diverged Understanding history as a graph

Slide 196

Slide 196 text

jacob_grimm/big_bad_ogre Understanding history as a graph

Slide 197

Slide 197 text

origin/master and master Understanding history as a graph

Slide 198

Slide 198 text

Understanding history as a graph Find last common commit

Slide 199

Slide 199 text

Understanding history as a graph Find last common commit

Slide 200

Slide 200 text

Find last common commit Understanding history as a graph

Slide 201

Slide 201 text

Understanding history as a graph Find last common commit

Slide 202

Slide 202 text

jacob_grimm/big_bad_ogre has commits Understanding history as a graph

Slide 203

Slide 203 text

origin/master and master have commits Understanding history as a graph

Slide 204

Slide 204 text

master jacob_grimm/big_bad_ogre

Slide 205

Slide 205 text

To bubble, or not to bubble

Slide 206

Slide 206 text

Merge (bubble)

Slide 207

Slide 207 text

Merge (bubble)

Slide 208

Slide 208 text

Merge (bubble)

Slide 209

Slide 209 text

Branch to merge into jacob_grimm/big_bad_ogre Merge (bubble)

Slide 210

Slide 210 text

opens editor Merge (bubble)

Slide 211

Slide 211 text

auto populate commit message Merge (bubble)

Slide 212

Slide 212 text

save Merge (bubble)

Slide 213

Slide 213 text

Merge (bubble)

Slide 214

Slide 214 text

This means it worked! Merge (bubble)

Slide 215

Slide 215 text

History as a graph

Slide 216

Slide 216 text

History as a graph

Slide 217

Slide 217 text

‘bubble’ History as a graph

Slide 218

Slide 218 text

merge commit History as a graph

Slide 219

Slide 219 text

HEAD History as a graph

Slide 220

Slide 220 text

jacob_grimm/big_bad_ogre History as a graph

Slide 221

Slide 221 text

jacob_grimm/big_bad_ogre has commits (merge included) History as a graph

Slide 222

Slide 222 text

jacob_grimm/big_bad_ogre has commits (merge included) History as a graph

Slide 223

Slide 223 text

jacob_grimm/big_bad_ogre has commits (merge included) History as a graph

Slide 224

Slide 224 text

jacob_grimm/big_bad_ogre has commits (merge included) History as a graph

Slide 225

Slide 225 text

jacob_grimm/big_bad_ogre has commits (merge included) History as a graph

Slide 226

Slide 226 text

jacob_grimm/big_bad_ogre has commits (merge included) History as a graph

Slide 227

Slide 227 text

jacob_grimm/big_bad_ogre has commits (merge included) History as a graph

Slide 228

Slide 228 text

jacob_grimm/big_bad_ogre has commits (merge included) History as a graph

Slide 229

Slide 229 text

jacob_grimm/big_bad_ogre has commits (merge included) History as a graph

Slide 230

Slide 230 text

History as a graph jacob_grimm/big_bad_ogre has commits (merge included)

Slide 231

Slide 231 text

origin/master and master History as a graph

Slide 232

Slide 232 text

origin/master and master have commits (merge NOT included) History as a graph

Slide 233

Slide 233 text

origin/master and master have commits (merge NOT included) History as a graph

Slide 234

Slide 234 text

origin/master and master have commits (merge NOT included) History as a graph

Slide 235

Slide 235 text

origin/master and master have commits (merge NOT included) History as a graph

Slide 236

Slide 236 text

origin/master and master have commits (merge NOT included) History as a graph

Slide 237

Slide 237 text

origin/master and master have commits (merge NOT included) History as a graph

Slide 238

Slide 238 text

History as a graph origin/master and master have commits (merge NOT included)

Slide 239

Slide 239 text

If we now merged jacob_grimm/big_bad_ogre into master,! the merge commit would then be included in master.

Slide 240

Slide 240 text

From the perspective of master,! I don’t want to know every time Jacob Grimm! merged master into jacob_grimm/big_bad_ogre. If we now merged jacob_grimm/big_bad_ogre into master,! the merge commit would then be included in master.

Slide 241

Slide 241 text

From the perspective of master,! I don’t want to know every time Jacob Grimm! merged master into jacob_grimm/big_bad_ogre. Let’s fix that! If we now merged jacob_grimm/big_bad_ogre into master,! the merge commit would then be included in master.

Slide 242

Slide 242 text

Undo merge

Slide 243

Slide 243 text

Undo merge Find sha before merge commit

Slide 244

Slide 244 text

Undo merge Find sha before merge commit

Slide 245

Slide 245 text

Undo merge Find sha before merge commit

Slide 246

Slide 246 text

Undo merge Find sha before merge commit

Slide 247

Slide 247 text

Undo merge Find sha before merge commit

Slide 248

Slide 248 text

Undo merge Copy sha to clipboard

Slide 249

Slide 249 text

Undo merge undo

Slide 250

Slide 250 text

Undo merge paste sha from clipboard

Slide 251

Slide 251 text

Undo merge

Slide 252

Slide 252 text

History as graph

Slide 253

Slide 253 text

History as graph

Slide 254

Slide 254 text

History as graph HEAD is now at sha e492be4 AND merge is gone

Slide 255

Slide 255 text

History as graph HEAD is now at sha e492be4 AND merge is gone

Slide 256

Slide 256 text

History as graph HEAD is now at sha e492be4 AND merge is gone

Slide 257

Slide 257 text

History as graph HEAD is now at sha e492be4 AND merge is gone

Slide 258

Slide 258 text

As if merge never happened

Slide 259

Slide 259 text

master jacob_grim/big_bad_gore

Slide 260

Slide 260 text

Rebase (no bubble)

Slide 261

Slide 261 text

Rebase (no bubble)

Slide 262

Slide 262 text

History as graph

Slide 263

Slide 263 text

HEAD History as graph

Slide 264

Slide 264 text

jacob_grimm/big_bad_ogre has commits History as graph

Slide 265

Slide 265 text

jacob_grimm/big_bad_ogre has commits History as graph

Slide 266

Slide 266 text

jacob_grimm/big_bad_ogre has commits History as graph

Slide 267

Slide 267 text

jacob_grimm/big_bad_ogre has commits History as graph

Slide 268

Slide 268 text

jacob_grimm/big_bad_ogre has commits History as graph

Slide 269

Slide 269 text

jacob_grimm/big_bad_ogre has commits History as graph

Slide 270

Slide 270 text

jacob_grimm/big_bad_ogre has commits History as graph

Slide 271

Slide 271 text

origin/master and master History as graph

Slide 272

Slide 272 text

History as graph origin/master and master have commits

Slide 273

Slide 273 text

History as graph origin/master and master have commits

Slide 274

Slide 274 text

History as graph origin/master and master have commits

Slide 275

Slide 275 text

History as graph origin/master and master have commits

Slide 276

Slide 276 text

History as graph origin/master and master have commits

Slide 277

Slide 277 text

History as graph origin/master and master have commits

Slide 278

Slide 278 text

However …

Slide 279

Slide 279 text

Snapshot before rebase

Slide 280

Slide 280 text

sha was e492be4 Snapshot before rebase

Slide 281

Slide 281 text

Current

Slide 282

Slide 282 text

sha is 106db2 Current

Slide 283

Slide 283 text

e492be4 106d6b2 Current

Slide 284

Slide 284 text

Push jacob_grimm/big_bad_ogre to remote (github) remote name

Slide 285

Slide 285 text

Push jacob_grimm/big_bad_ogre to remote (github) branch name

Slide 286

Slide 286 text

Push jacob_grimm/big_bad_ogre to remote (github) branch name Will create branch on origin if does not exist

Slide 287

Slide 287 text

Push jacob_grimm/big_bad_ogre to remote (github)

Slide 288

Slide 288 text

Remote (github)

Slide 289

Slide 289 text

master jacob_grimm/big_bad_ogre

Slide 290

Slide 290 text

To bubble, or not to bubble

Slide 291

Slide 291 text

Merge (no bubble)

Slide 292

Slide 292 text

Merge (no bubble)

Slide 293

Slide 293 text

Branch to merge into master Merge (no bubble)

Slide 294

Slide 294 text

Merge (no bubble)

Slide 295

Slide 295 text

Merge (no bubble)

Slide 296

Slide 296 text

History as a graph no ‘bubble’, why? git will try to ‘fast forward’ merge

Slide 297

Slide 297 text

History as a graph No ‘bubble’!?! Git will ‘fast forward’ merge if possible! I like to see the feature branch ‘bubble’

Slide 298

Slide 298 text

History as a graph No ‘bubble’!?! Git will ‘fast forward’ merge if possible! I like to see the feature branch ‘bubble’

Slide 299

Slide 299 text

History as a graph No ‘bubble’!?! Git will ‘fast forward’ merge if possible!

Slide 300

Slide 300 text

Fast Forward 1 2 3 4 5 6 HEAD, master jacob_grimm/big_bad_ogre

Slide 301

Slide 301 text

5 Fast Forward 1 2 3 4 6 HEAD, master jacob_grimm/big_bad_ogre

Slide 302

Slide 302 text

5 Fast Forward 1 2 3 4 6 , HEAD, master jacob_grimm/big_bad_ogre

Slide 303

Slide 303 text

5 Fast Forward 1 2 3 4 6 , HEAD, master jacob_grimm/big_bad_ogre

Slide 304

Slide 304 text

History as a graph No ‘bubble’!?! Git will ‘fast forward’ merge if possible! I like to see feature branch ‘bubble’(s)

Slide 305

Slide 305 text

Let’s make a feature branch ‘bubble’

Slide 306

Slide 306 text

Undo merge

Slide 307

Slide 307 text

Undo merge commit before merge

Slide 308

Slide 308 text

copy sha to clipboard Undo merge

Slide 309

Slide 309 text

Undo merge

Slide 310

Slide 310 text

Undo merge undo

Slide 311

Slide 311 text

Undo merge paste sha from clipboard

Slide 312

Slide 312 text

Undo merge

Slide 313

Slide 313 text

Undo merge

Slide 314

Slide 314 text

Undo merge

Slide 315

Slide 315 text

As if merge never happened

Slide 316

Slide 316 text

Merge (bubble) no fast-forward merge

Slide 317

Slide 317 text

Branch to merge into master Merge (bubble)

Slide 318

Slide 318 text

opens editor

Slide 319

Slide 319 text

auto populates merge commit message

Slide 320

Slide 320 text

save

Slide 321

Slide 321 text

recursive strategy! (not fast forward) Merge (bubble)

Slide 322

Slide 322 text

History as graph

Slide 323

Slide 323 text

History as graph

Slide 324

Slide 324 text

History as graph

Slide 325

Slide 325 text

merge commit History as graph

Slide 326

Slide 326 text

master has commits History as graph

Slide 327

Slide 327 text

master has commits History as graph

Slide 328

Slide 328 text

master has commits History as graph

Slide 329

Slide 329 text

master has commits History as graph

Slide 330

Slide 330 text

master has commits History as graph

Slide 331

Slide 331 text

master has commits History as graph

Slide 332

Slide 332 text

master has commits History as graph

Slide 333

Slide 333 text

master has commits History as graph

Slide 334

Slide 334 text

master has commits History as graph

Slide 335

Slide 335 text

History as graph

Slide 336

Slide 336 text

jacob_grimm/big_bad_ogre has commits History as graph

Slide 337

Slide 337 text

jacob_grimm/big_bad_ogre has commits History as graph

Slide 338

Slide 338 text

jacob_grimm/big_bad_ogre has commits History as graph

Slide 339

Slide 339 text

jacob_grimm/big_bad_ogre has commits History as graph

Slide 340

Slide 340 text

jacob_grimm/big_bad_ogre has commits History as graph

Slide 341

Slide 341 text

jacob_grimm/big_bad_ogre has commits History as graph

Slide 342

Slide 342 text

jacob_grimm/big_bad_ogre has commits History as graph

Slide 343

Slide 343 text

History as graph

Slide 344

Slide 344 text

History as graph origin/master has commits

Slide 345

Slide 345 text

History as graph

Slide 346

Slide 346 text

History as graph

Slide 347

Slide 347 text

History as graph

Slide 348

Slide 348 text

History as graph

Slide 349

Slide 349 text

History as graph

Slide 350

Slide 350 text

History as graph

Slide 351

Slide 351 text

remote name branch name Push to remote (github)

Slide 352

Slide 352 text

Push to remote (github)

Slide 353

Slide 353 text

Remote (GitHub)

Slide 354

Slide 354 text

Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase

Slide 355

Slide 355 text

Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase

Slide 356

Slide 356 text

Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase

Slide 357

Slide 357 text

Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase

Slide 358

Slide 358 text

Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase

Slide 359

Slide 359 text

Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase

Slide 360

Slide 360 text

Create Repo Workflow Configurations History Rebase Remotes Merge vs Rebase

Slide 361

Slide 361 text

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 (great book)! 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