Understanding and mastering Git
Buy now
Learn more
Section 1: Introduction to Git
01 Intro and welcome
02-what-is-version-control
03 Installing Git
04 The "git" command
05 Repositories
06 git config
07 git global config
Section 2: Staging and committing
08 Adding + committing your first file
08a commit messages and editors
09 More on adding and committing
10 Storing directories
11 Reading commit message and SHA-1
12 Exercises
exercises-1.txt
13 Exercise solutions
14 Adding + modifying = weird status
Section 3: Git logs and status
15 Basic log viewing
16 Advanced log viewing
17 gitignore
18 git diff
19 Exercises
exercises-2.txt
20 Exercise solutions
Section 4: HEAD and commits
21 checkout and HEAD
22 Visualizing commits with Sourcetree
23 Git reset
Section 5: Fixing mistakes
24 New commits, git revert
25 Mistake exercises
exercises-3.txt
26 Mistake exercise solutions
27 Reverting earlier commits
28 Committing with --amend
29 git reset --hard
Section 6: Git objects
30 Git objects
Section 7: Git branches
31 Intro to branches
32 Committing and branches
33 Visualizing branches
34 Branching exercises
exercises-4.txt
35 Branch exercise solutions
36 When Git won't let you switch bran...
37 git diff and branches
38 When the most recent commits are bad
Section 8: Git merges
39 Intro to merging
40 Fast forward merges
41 Exercises with fast forward merges
exercises-5.txt
42 Exercises with fast forward merges...
43 Merge commits
44 Exercises with merge commits
exercises-6.txt
45 Exercises with merge commits — sol...
46 Deleting and recreating branches
47 Conflicts
48 Exercises with conflicts
exercises-7.txt
49 Exercises with conflicts — solutions
50 Merge strategy
51 Squash commits
52 Rebase
exercises-8.txt
53 Rebase exercises
54 Rebase exercise solutions
55 Interactive rebase
Section 9: Hints and tricks
56 Git bisect
57 Git blame
58 Git grep
59 Renaming files
60 Deleting files
61 Restoring files from earlier in hi...
62 Git stash
63 Git reflog
64 Git tags
Section 10: Git on the network
65 Git on the network
66 Creating and cloning on GitHub and...
67 Cloned repositories
68 Git push
69 Pulling, pushing, and conflicts
70 Exercises with pulling and pushing
exercises-9.txt
71 Exercise solutions with pulling an...
72 Pulling with rebase
73 Feature branches via GitHub
74 Merging feature branches into master
75 Pull requests
76 Feature merging exercises
77 Feature merging exercise solutions
exercises-10.txt
78 Importing into GitHub
79 Finale
Slide PDFs
01 Git introduction.key.pdf
02 Git staging and committing.key.pdf
03 Git log and status.key.pdf
04 Git head and commits.key.pdf
05 Git fixing mistakes.key.pdf
06 Git objects.key.pdf
07 Git branches.key.pdf
08 Git merging.key.pdf
09 Git useful hints.key.pdf
10 Git remote branches.key.pdf
11 Git resources.key.pdf
Products
Course
Section
Section 8: Git merges
Section 8: Git merges
Understanding and mastering Git
Buy now
Learn more
Section 1: Introduction to Git
01 Intro and welcome
02-what-is-version-control
03 Installing Git
04 The "git" command
05 Repositories
06 git config
07 git global config
Section 2: Staging and committing
08 Adding + committing your first file
08a commit messages and editors
09 More on adding and committing
10 Storing directories
11 Reading commit message and SHA-1
12 Exercises
exercises-1.txt
13 Exercise solutions
14 Adding + modifying = weird status
Section 3: Git logs and status
15 Basic log viewing
16 Advanced log viewing
17 gitignore
18 git diff
19 Exercises
exercises-2.txt
20 Exercise solutions
Section 4: HEAD and commits
21 checkout and HEAD
22 Visualizing commits with Sourcetree
23 Git reset
Section 5: Fixing mistakes
24 New commits, git revert
25 Mistake exercises
exercises-3.txt
26 Mistake exercise solutions
27 Reverting earlier commits
28 Committing with --amend
29 git reset --hard
Section 6: Git objects
30 Git objects
Section 7: Git branches
31 Intro to branches
32 Committing and branches
33 Visualizing branches
34 Branching exercises
exercises-4.txt
35 Branch exercise solutions
36 When Git won't let you switch bran...
37 git diff and branches
38 When the most recent commits are bad
Section 8: Git merges
39 Intro to merging
40 Fast forward merges
41 Exercises with fast forward merges
exercises-5.txt
42 Exercises with fast forward merges...
43 Merge commits
44 Exercises with merge commits
exercises-6.txt
45 Exercises with merge commits — sol...
46 Deleting and recreating branches
47 Conflicts
48 Exercises with conflicts
exercises-7.txt
49 Exercises with conflicts — solutions
50 Merge strategy
51 Squash commits
52 Rebase
exercises-8.txt
53 Rebase exercises
54 Rebase exercise solutions
55 Interactive rebase
Section 9: Hints and tricks
56 Git bisect
57 Git blame
58 Git grep
59 Renaming files
60 Deleting files
61 Restoring files from earlier in hi...
62 Git stash
63 Git reflog
64 Git tags
Section 10: Git on the network
65 Git on the network
66 Creating and cloning on GitHub and...
67 Cloned repositories
68 Git push
69 Pulling, pushing, and conflicts
70 Exercises with pulling and pushing
exercises-9.txt
71 Exercise solutions with pulling an...
72 Pulling with rebase
73 Feature branches via GitHub
74 Merging feature branches into master
75 Pull requests
76 Feature merging exercises
77 Feature merging exercise solutions
exercises-10.txt
78 Importing into GitHub
79 Finale
Slide PDFs
01 Git introduction.key.pdf
02 Git staging and committing.key.pdf
03 Git log and status.key.pdf
04 Git head and commits.key.pdf
05 Git fixing mistakes.key.pdf
06 Git objects.key.pdf
07 Git branches.key.pdf
08 Git merging.key.pdf
09 Git useful hints.key.pdf
10 Git remote branches.key.pdf
11 Git resources.key.pdf
21 Lessons
39 Intro to merging
40 Fast forward merges
41 Exercises with fast forward merges
exercises-5.txt
42 Exercises with fast forward merges...
43 Merge commits
44 Exercises with merge commits
exercises-6.txt
45 Exercises with merge commits — sol...
46 Deleting and recreating branches
47 Conflicts
48 Exercises with conflicts
exercises-7.txt
49 Exercises with conflicts — solutions
50 Merge strategy
51 Squash commits
52 Rebase
exercises-8.txt
53 Rebase exercises
54 Rebase exercise solutions
55 Interactive rebase