-
Notifications
You must be signed in to change notification settings - Fork 0
/
training.txt
44 lines (36 loc) · 1.06 KB
/
training.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
First Day
---------
- Notes from the screencast: http://help.github.com/git-cheat-sheets/
- Linus Torvalds
- Can do everything offline - Branching, Merging, Reverting, Committing
- Distributed - push/pull/from/to/any repo
- Create branches all the time - much easier
- much cleaner - no .svn files throughout your directory
- whitespace, aliases
Second Day
----------
- Content - Not Files
- git commit -a
- git commit -v
- git log
-
Third Day
---------
- Recap
- Making further changes to Master
- Try to make some changes and switch the branch without committing
- Testing issue with "update" when switching branches
- Demo rebase with merge
- Do a diff between master and branch
- Merge changes from branch back into master
- Change made to master BEFORE merging changes from branch-1
- Reset - haven't tried it
Fourth day
---------
- Repositories
- no real concept of client/server - depends on where you clone from
- push/pull is for the current branch
- git remote
Questions
---------
- Find out why it says 2 files instead of the actual number that was initially checked in