Git Fundamentals

Name: Git Fundamentals
Rating: 4.6 (17 reviews)

Learn the fundamentals of using Git for source control through practical examples and exercises

Created byDevFluence .

Last updated 1/2023

English

English [Auto],

What you'll learn

To know what source control is, and what Git is
To be able to navigate a file system using the command line
To be able to stage and commit your changes to Git
To be able to view the log and history of commits
To know how Git stores your changes on your file system (a basic understanding)
To be able to push your changes to a remote repository
To be able to get others' changes from a remote repository
To know the difference between rebasing and pulling and be able to do both
To be able to deal with merge conflicts when pulling or rebasing
To be able to branch and merge
To be able to stash working changes temporarily
To be able to tag a commit with a human-friendly name
To be able to use Git Extensions, a GUI front end for Git, in order to help you fulfill your daily development tasks quicker

Course content

6 sections • 38 lectures • 3h 49m total length

Welcome!3:27
Master git fundamentals for source control with command-line workflows for local and remote repositories. Explore branching, merging, and stashing, plus a gui option with git extensions.
Introduction and Course Structure2:31
What is Source Control (aka Version Control)?9:53
Explore how version control records file changes over time, from manual copy techniques to distributed systems like git, enabling local commits and remote pushes for collaborative development.
Installing Git on Windows8:08
Install git on Windows by downloading the 64-bit installer, selecting a preferred editor, and configuring path and line ending options for a smooth setup.
Intro to Windows Command Prompt9:07
Master the Windows command prompt and file system basics, including navigating directories, switching drives, and using core commands like cd, dir, mkdir, copy, rename, and move for Git workflows.
Windows Command Prompt Exercises0:17
Intro to the Bash Shell8:25
Explore the bash shell and git bash basics, highlighting differences between Windows and Unix file systems, using forward slashes, and navigation commands like cd and ls.
Bash Exercises0:19
Your First Repository9:24
Initiate a local git repository with git init, explore the .git folder, and track changes by adding files, staging, and committing on the main branch to build a repository history.
Configuring your Name and Email3:13
Configure your global git identity by setting your name and email so every commit records the correct author, and learn to view and edit git config settings.
Further Notes and References0:17

Staging Changes - Git add11:20
Stage changes deliberately with git add to move modifications into the staging area, then commit; learn how status, diff, and interactive add help track unstaged and untracked files.
Committing Changes - Git Commit6:16
Learn to commit staged changes with git commit, using -m or the editor, write meaningful messages (present tense or semantic), and keep logical, separate commits.
Amending Commits4:06
Amend a recent commit to include overlooked changes by running git commit --amend after staging with git add, and avoid amending commits already pushed to a remote.
The Anatomy of a Commit - Git Log (and Git Show)9:36
Explore the anatomy of a git commit, including the hash, author, date, and patch, and learn how git log, git show, and head pointers reveal sequential history and changes.
Unstaging and resetting - Git Reset4:08
Master git reset to unstage changes and manage your working tree. Learn soft, mixed, and hard resets, restore staged files, and return to the latest commit on head.
Local Repository Exercises0:02

Your First Remote - Git Clone10:03
Learn how to clone a remote GitHub repository, set up a private project with a dot git ignore, commit changes, and push and pull to synchronize with origin.
Pushing and Pulling - The Simple Case8:31
Explore the simple case of git pushing and pulling, using clones and commits to align local main with origin.
Remote Repository Exercises0:02
Pulling with Merge (No Conflicts)8:31
Explore merging two divergent local changes using the merge method, handling non-conflicting updates from local one and local two, and creating a merge commit after pulling.
Fetch and Rebase (No Conflicts)12:26
Compare the rebase and merge methods in git, demonstrate fetch and rebase to replay local commits on the remote history, and discuss when to rebase versus merge.
Merging with Conflicts7:31
Illustrate merging with conflicts by simulating concurrent edits, resolving them with a merge tool, selecting lines from both local changes and the remote, then committing and pushing the merged main.
Rebasing with Conflicts9:52
The rebasing with conflicts lecture shows conflicts are resolved locally, not on the remote, so push and commit often and then fetch, rebase, and resolve conflicts manually.
Merging and Rebasing Exercises0:02

Store Changes Temporarily - Git Stash6:24
Learn how git stash lets you set aside uncommitted changes to pull from remote safely. Use stash push and stash pop to reapply changes after updating, handling conflicts when needed.
Branching and Merging - Git Branch and Git Merge14:04
Explore Git branching by creating, fetching, checking out, and merging feature branches with main, including push, pull, and remote origin workflows, and learn to keep branches short-lived.
Tagging (Briefly) - Git Tag2:56
Learn how Git tags mark a specific commit with a version, including lightweight and annotated options, and how to push them with git push origin --tags.
Stashing, Branching and Tagging Exercises0:02

Installing Git Extensions2:26
Install git extensions, a Windows GUI for managing git commands and repositories that mirrors command output. Download the MSI or ZIP and install for all users, enabling Windows integration.
Cloning and Browsing your Repository6:59
Clone a repository with git extensions and explore its history, branches, submodules, and diffs. Navigate commits, tags, and the file tree to understand the repository structure and workflow.
Pull, Commit, Push Workflow in Git Extensions8:45
Explore the pull, fetch, and push workflow using Git Extensions, including rebase versus merge, staging changes, and committing with descriptive messages, then push to origin/main.
Other Git Commands and Settings7:47
Delve into advanced git commands and settings, including amend, stash management, branching, cherry-pick, bisect, patches, submodules, sparse checkout, and global versus local settings via Git Extensions.
Merging from a Remote (with and without conflicts)12:00
Learn how to merge from a remote with and without conflicts using git extensions, including handling merge conflicts, using pull and push workflows, and basic conflict resolution tools.
Stashing5:53
Learn how to stash local changes, perform a pull with merge or rebase, and pop the stash to resolve conflicts, while managing stash entries.
Branching and Merging12:43
Master branching and merging in git by creating and checking out local branches from remote origins, tracking updates, committing and pushing changes, and merging feature branches into main.
Git Extensions Exercises0:54

Requirements

The ability to code in a programming language (at least 1 year of study or experience)
An understanding of files and the file system on Windows
The ability to use the Command Prompt or Powershell in Windows, at a basic level, to navigate a file system and execute commands.
An email address in order to sign up to Github (a free account)

Description

Git is the most popular source control tool in the world today, so knowing Git is an essential skill for just about every developer. This course covers the fundamentals of Git - what it's for, how it works, and how to use it in your every day work.

We cover all of the day to day usage of Git, from cloning, to committing, to pushing and pulling, and even branching and merging (and the dreaded merge conflict). The course is aimed at developers who are coming to Git for the first time so no prior knowledge is necessary, but it's also useful for those of you who have been using Git and are wanting to gain a slightly better understanding of how things are working and how to think about what Git is doing so that you can troubleshoot when it throws surprises your way.

In the interest of preparing you for day to day usage, we also cover using Git Extensions, a cross-platform third-party UI built on top of the Git command line that you can use to be more productive in your daily work.

For each section we provide practical video demonstrations of each activity, diagrams showing how what we've done has affected the repository, and also some exercises for you to do in order to practice for yourself.

This course should get you up and running with using Git in your daily work, and provide you with enough understanding of the underlying systems and concepts that you are able to utilize the power Git provides.

Who this course is for:

This course is designed for developers who are new to source control, or have not yet used Git

Git Fundamentals

What you'll learn

Explore related topics

Course content

Getting Started11 lectures • 55min

Working Locally6 lectures • 35min

Working with a Remote8 lectures • 57min

Further Git Features4 lectures • 23min

Using Git Extensions (a useful UI over GIT)8 lectures • 57min

Extra - Some further Exploration and Links1 lecture • 1min

Requirements

Description

Who this course is for: