-
Notifications
You must be signed in to change notification settings - Fork 0
/
_topics.txt
122 lines (102 loc) · 1.64 KB
/
_topics.txt
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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
=========================
Common 1
=========================
* console vs gui
=========================
Git 1
=========================
* stash
* rebase
* detached head
* revision specifiers
- master@{yesterday}
- master@{1 month ago}
- master@{5}
- carrot parent
- tilde parent
- tree pointer
- blob in commit
- ranges
* cherry-picking
* rebasing
* git.alias
* auto-rebase
* git add --all
* pushing and pulling
- push -f
- config credentials
* tags
* remotes
* config
* gui
* git bash
* resources
* tools
- gitextensions
- tortoisegit
- VS integration
* resources
- visual guide to Git
- kiro's simulator
=========================
Hg 1
=========================
* mercurial is written in python
* revsets
* pull -u
* plugins
=========================
Branching
=========================
* merge conflicts
- diff format
* mercurial
- branches vs bookmarks
- a branch is unique by name
=========================
Common 2
=========================
* Clean history
- rebase
- rebase -i
- selective commits
- no-ff
- good commit msgs
- no whitespace edits
* forks and pull requests
* repo architectures
- star
- master/lieutenants
- forks/integration
- dev/qa/uat/publish
* hooks
- persistent branch information
- repo moved to git
=========================
Git 2
=========================
* dangling commits
* stash, stash+branching
* gc, fsck, prune
* bisect
* pickaxe
* crlf config
* reflog
* replace+filter branch
* graft
* format-patch/apply, am
* archive
* internals
- shacon's slides, 77+
=========================
Hg 2
=========================
* hg phases
* hg mq
* patch queues
* hg web
* hg strip
* reflog structure
* tools
- visualhg
- tortoisehg