Git Tutorial

Git is an open-source distributed version control system that helps teams track and manage code changes, collaborate seamlessly and work on projects of any size. It keeps a history of every change, allowing you to revisit or restore previous versions and makes it easy to fix mistakes without losing progress.

Introduction to Git

Git is a distributed version control system used to track changes in code and manage collaborative software development.

• Version Control System
• Introduction of Git
• History of Git
• Git Features
• Repositories
• Repositories and Commands in Git
• Git Ignore
• Readme.md File
• Git vs. GitHub

Before starting understanding Git practically, let us first install Git on our systems:

• Setup Git Server on Ubuntu
• Install GIT by NPM Packages

Working with Git

Working with Git means managing your project’s code using Git commands to track, save and share changes:

• Git Environment Setup
• Using Git on CLI
• Working on Git Bash
• Git Setting up a Repository
• Working with Git Repositories
• States of a File in Git Working Directory

Git Commands

Git commands are used to perform version control operations such as tracking changes, managing branches and collaborating on code.

1. Getting Started

The fundamental commands to initialize a repository, add files, commit changes, check status and save work in Git.

• Git init
• Git add
• Git commit
• Git status
• Save a File in Git

2. Remote Repositories

Commands for working with remote repositories, including adding remotes, cloning projects, pushing local commits, pulling updates and setting upstream branches.

• Git Remote
• Git Origin Master
• Git Push
• Git Pull
• Git Pull and Fetch
• Set Upstream Branch on Git
• Clone a Repository

3. Branching & Merging

Create and push branches to remote, delete them locally and remotely, switch between branches using checkout and merge changes into the main codebase.

• Push Git Branch to Remote
• Delete a Git Branch Locally and Remotely
• Git Checkout and Merge
• Git Merge
• Git Merge Conflicts
• Git Rebase
• Git Squash
• Git Fork

4. File & Change Management

Manage changes in Git from comparing file differences with diff, cleaning up untracked files, renaming or moving files and staging updates, to undoing commits, removing untracked files and even adding empty directories to a repository.

• Git diff
• Git Clean
• Git Rename
• Git Move Files
• Git Undo Commit
• Git Undo
• Git Stage
• Remove Local Untracked Files
• Add an Empty Directory to a Git Repository

5. History & Debugging

Review and debug a project’s history using git log to view and format commits, exploring references with reflog, tracing changes with blame and recovering lost commits

• Git Log
• Customizing Commit History with Git Log
• Git Ref and Reflog
• Git Blame
• Recovering Lost Commits
• Git Show
• Git Working Tree
• Git Index

6. Advanced Commands

Advanced Git features like aliases, submodules, subtrees, tags, hooks, patching, pruning, history rewriting, git add variations, debugging and error handling.

• Git Alias
• Git Submodules
• Git Subtree
• Git Tags
• Git Hooks
• Patch Operation in Git
• Git Prune
• Git Filtering the Commit History
• Managing Commit History
• Types of Git add
• git add -A vs. git add
• Debugging in a Git
• Error Searching and Handling in Git

Git Advanced Usage

Advanced Git concepts, including branching, exporting projects, handling errors, common issues and integrating Git with development tools like RStudio and Eclipse.

1. Advanced Git Concepts

This section covers branching, exporting projects, commit management, Git objects and handling large repositories.

• Introduction to Git Branch
• Export a Git Project
• Move the most recent commit(s) to a new branch with Git
• Git–Pack Objects
• Handle Big Repositories with Git

2. Error Handling & Troubleshooting

This section covers common Git errors, authentication issues and solutions for repository lock problems.

• Common Git Problems and Their Fixes
• Fix Git Authentication Failed Error
• Resolve Git Lock File Conflict

3. Git Automation & Extensions

This section covers automating Git tasks, sending emails and using Git in Google Colab.

• Send an Email using Git send-email via Gmail
• Automating some git commands with Python
• Install and Use Git in Google Colab

4. Alternative VCS & Comparisons

This section introduces alternative VCS tools like Bitbucket and Mercurial and compares them with Git and SVN.

• Introduction to Bitbucket
• Working on Bitbucket using Git
• Introduction to Mercurial
• Difference between MERCURIAL and GIT
• Difference between Git and SVN

5. Git in CI/CD

This section covers Git integration in CI/CD pipelines, including Jenkins setup, GitLab workflows for different languages and hosting private Git servers on Kubernetes.

• Jenkins and GIT Integration using SSH Key
• Add GIT Credentials in Jenkins
• CI/CD in .NET application Using Shell Executor on GitLab
• CI/CD in Java application(Linux) Using Shell and Docker Executor on GitLab
• CI/CD in C/C++ Application(Linux) Using Shell and Docker Executor on GitLab
• Installing Private Git Server on K8s Cluster with Gitea and AKS

Git Deployment

This section covers deploying static sites and Django applications to Heroku using Git.

• Basic Static HTML Website to Heroku using Git
• Django Application to Heroku with Git CLI

Git Collaborating

This section covers Git collaboration basics, forking workflows, pull requests, merge strategies and conflict resolution.

• Git Collaboration
• Forking Workflow in Open Source Ecosystem
• Make your first Open Source Pull Request
• Merge Strategies in Git
• Handling Merge Conflicts