Git Cheatsheet: A Quick Reference Guide for Developers

Git is a distributed version control system that allows users to track changes in their code and collaborate with others on the same project. In this section, we will cover the basics of getting started with Git, including installing Git, configuring Git, and initializing a new repository.

Installing Git

Before using Git, it must be installed on your computer. Git can be installed on Windows, Mac, and Linux operating systems. To install Git, follow the instructions on the Git website.

Basic Git Commands

Git is a powerful version control system that helps developers collaborate on projects of any size. Here are some of the most commonly used basic Git commands:

• Initialize an empty Git repository:

git init

• Show the status of your repository:

git status

• Stage a specific file:

git add readme.txt

• Stage all changed files:

git add .

• Commit the staged files:

git commit -m "Create readme file"

• Define notepad as an editor. It will be used when you run the git commit command without -m parameter:

git config --global core.editor notepad

• Show the changes of a specific file:

git diff readme.txt

• Show the changes in your working directory:

git diff

• Show the changes in your staging area:

git diff --staged

• Show the history/log:

git log

• Show the history/log with one commit per line:

git log --pretty=oneline

• Checkout a specific commit by its snapshot hash:

git checkout b346471

• Navigate back to your main branch:

git checkout main

Now you know how to work with a local repository.

Branching and merging code

In this section, you will learn how to branch and merge your code.

• List the local branches:

git branch

• Create a new branch with the name "feature/AddTwitterHandle":

git branch feature/AddTwitterHandle

• Checkout the new branch:

git checkout feature/AddTwitterHandle

• Checkout the main branch:

git checkout main

• Merge changes from the feature branch into the main branch. This command assumes that you have the main branch checked out:

git merge feature/AddTwitterHandle

• Show a graph when showing the history:

git log --pretty=oneline --graph

Now you know how to branch and merge your code, which can be helpful when you want to work on different features in parallel.

Pushing to a remote repository

In this section, you will learn how to push your code to a remote repository on GitHub.

• Add the remote repository https://repositoryURL under the name origin to your local repository:

git remote add origin https://repositoryURL

• Push the first time to the main branch of the remote repository and set it as upstream:

git push -u origin main

• Push the next commits to the remote repository:

git push

• Clone a remote repository with the URL https://repositoryURL into a local repository on your machine:

git clone https://repositoryURL

• Clone a remote repository into the current directory (Note the separate dot at the end that indicates the current directory):

git clone https://repositoryURL .

• Fetch changes from the remote repository without merging them into your local branch:

• git fetch

Now you know how to push your code to a remote repository on GitHub, how to clone a remote repository, and how to pull changes from the remote repository into your local repository.

In summary, Git provides several tools for troubleshooting and help, including common issue solutions, accessing logs, and using Git help. These tools can help users efficiently use Git and resolve any issues that may arise.