You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: advanced/beta.md
+93-6Lines changed: 93 additions & 6 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -6,7 +6,10 @@ description: Mastering Git and GitHub
6
6
7
7
This curriculum will be your companion to the GitHub Advanced class taught by the GitHub Training Team and other educational groups. In this course, you'll explore strategies for branch and history rewriting, temporary storing and recovery techniques, and Git technology mechanics for faster problem solving.
8
8
9
+
{% capture slide %}
9
10
### Understanding Git
11
+
{% endcapture %}
12
+
{% include slide-section %}
10
13
11
14
* Directed acyclic graph
12
15
* Tree object
@@ -38,8 +41,10 @@ HEAD@{today}
38
41
```
39
42
40
43
41
-
44
+
{% capture slide %}
42
45
### Common branching strategies
46
+
{% endcapture %}
47
+
{% include slide-section %}
43
48
44
49
#### Summary
45
50
* GitHub Flow
@@ -85,7 +90,12 @@ These are called Branching Strategies, but are just as easily called *Team Colla
85
90
*[How To Merge Without Fear](http://blog.springsource.org/2010/12/21/git-and-social-coding-how-to-merge-without-fear/)
86
91
*[What to do when things get complicated](http://blog.springsource.org/2011/07/18/social-coding-pull-requests-what-to-do-when-things-get-complicated/)
87
92
93
+
94
+
{% capture slide %}
88
95
### Applying branching patterns
96
+
{% endcapture %}
97
+
{% include slide-section %}
98
+
89
99
#### Summary
90
100
* Breaking features down into pieces
91
101
* Feedback early on Pull Requests
@@ -95,7 +105,12 @@ These are called Branching Strategies, but are just as easily called *Team Colla
95
105
#### Further reading
96
106
*[Validated Build Promotions with Git, GitHub, and Jenkins](http://www.youtube.com/watch?v=Gd8OfAmKkMQ)
97
107
108
+
109
+
{% capture slide %}
98
110
### Git-core GUIs
111
+
{% endcapture %}
112
+
{% include slide-section %}
113
+
99
114
100
115
#### Summary
101
116
* for staging, committing
@@ -111,9 +126,13 @@ $ gitk --all
111
126
```
112
127
113
128
129
+
{% capture slide %}
114
130
### Mastering Shortcuts
115
131
* Shortcuts to multiple steps
116
132
* Useful customized commands
133
+
{% endcapture %}
134
+
{% include slide-section %}
135
+
117
136
118
137
Add and commit along with the commit message:
119
138
@@ -133,11 +152,16 @@ Checkout and create a branch:
133
152
$ git checkout -b [branch] [base]
134
153
```
135
154
136
-
155
+
{% capture slide %}
137
156
### Isolating Work
157
+
138
158
* Version patches of large change sets
139
159
* Stage interactively on command line
140
160
* Revise to-be-committed patch
161
+
{% endcapture %}
162
+
{% include slide-section %}
163
+
164
+
141
165
142
166
```bash
143
167
# Stage by patch
@@ -147,7 +171,11 @@ $ git add -p [file]
147
171
git reset reset HEAD -p [file]
148
172
```
149
173
174
+
175
+
{% capture slide %}
150
176
### Branch best practices
177
+
{% endcapture %}
178
+
{% include slide-section %}
151
179
152
180
* Pros/cons of collapsing commits during merge
153
181
* Relation to branching strategies and deliverable expectations
@@ -176,8 +204,10 @@ List branches without this merged in:
0 commit comments