git-top-down/outline at master · github-flow/git-top-down · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
```
	Workflows!
    	Internals!
Tips & Tricks!
  Resolving conflicts!
	   Reading git output!
```

# Git - Top down!

* github-feature workflow
* hub-feature by hand
* conflict scenarios and resolution
* git internals
* git tips & tricks

Why top-down? Top to use efficiently, down for leaky abstractions.

## github-feature

* install
* clone
* start
* update
* review
* finish

## features by hand

* start
* update
* review
* finish

## Conflict

* ours
* theirs
* merge markers
* bailing
  * cherry-pick
* pretty rebase

## Internals

* hashes
* objects
* trees
* commits
* commitishes
* packs

## Tips & Tricks

* completion
* colorize
* show-branch
* plog
  * --since
  * -[n]
  * --author