Essential Git Cheat Sheet for Software Developers

Git is a distributed version control system that enables developers to collaborate on projects efficiently. It allows users to track changes to files, compare different versions, and revert to previous versions if necessary. Git has become an essential tool for software development, and developers around the world use it frequently. In fact, it is arguably the most important tool that any developer should know. For more information on Git, see the book "Pro Git" by Scott Chacon.

Here are some of the most commonly used Git commands that you should know:

git config

This command is used to specify user settings like email, username, and more. Here's an example:

git config --global user.email [email protected]

git init

This command is used to create a GIT repository. Here's how to use it:

git init

git add

Use the git add command to add files to the index. Here's an example:

git add temp.txt

git clone

Use the git clone command to clone a repository. Here's an example:

git clone username@host:/path/to/repository

git commit

Use the git commit command to commit changes to project files. Usage:

git commit –m "Message"

git push

Use git push to place configurations in the main branch of a remote repository associated with a working directory. For example:

git push origin master

git status

Use the git status command to display a list of modified files, along with files that have not yet been added to the index or are waiting for a commit. Usage:

git status

git checkout

Use the git checkout command to create branches or switch between them. For example:

git checkout -b <branch-name>

git remote

Use the git remote command to connect to a remote repository. This command displays a list of remote repositories currently configured:

git remote -v

git branch

Use the git branch command to display, create, or delete branches. To display all existing branches in the repository, enter:

git branch

git pull

Use the git pull command to merge changes from a remote repository to a local working directory. To use it, simply enter git pull in the command line:

git pull

git merge

Use the git merge command to merge active branches. For example, enter git merge <branch-name> in the command line.

git merge <branch-name>

git diff

Use the git diff command to identify the difference between branches. To identify the differences with base files, use:

git diff --base <file-name>

To view the differences between the branches that are to be merged until their merge, use:

git diff <source-branch> <target-branch>

For a simple display of existing differences, use git diff.

git tag

Use the git tag command to label certain commits with simple tags. For example, use:

git tag 1.1.0 <insert-commitID-here>

git log

Use the git log command to display a list of all commits in the branch along with their corresponding information. For example:

commit 15f4b6c44b3c8344caasdac9e4be13246e21sadw

Author: Alex Cadence [[email protected]](<mailto:[email protected]>)

Date: Wed May 3 12:56:29 2023 -0600

git reset

Use the git reset command to reset the index and working directory to the last commit state. Usage:

git reset --hard HEAD

git rm

Use the git rm command to remove files from both the index and working directory. Usage:

git rm filename.txt

git stash

Use git stash to temporarily save changes that won't be committed immediately. Usage:

git stash

git show

Use the git show command to view information about any git object. For example:

git show

git fetch

Use the git fetch command to fetch all objects from a remote repository that are missing from the local working directory. Usage example:

git fetch origin

git ls-tree

Use the git ls-tree command to view the tree of an object along with the name and mode of each item, and the SHA-1 value. For example:

git ls-tree HEAD

git cat-file

Use the git cat-file command to view the object type using the SHA-1 value. For example:

git cat-file –p d670460b4b4aece5915caf5c68d12f560a9fe3e4

git grep

Use git grep to search for phrases and words within the contents of trees. For example, to search for www.medium.com in all files, use this command:

git grep "www.medium.com"

gitk

Gitk is a graphical interface for a local repository. Call it by executing this command:

gitk

git instaweb

With the git instaweb command, you can start a web server associated with a local repository. The browser will also be automatically redirected to it. For example:

git instaweb –httpd=webrick

git gc

Use the git gc command to optimize a repository. It helps to remove and optimize unnecessary files:

git gc

git archive

The git archive command allows the user to create a .zip or .tar file containing components of one of the repository's trees. For example:

git archive --format=tar master

git prune

With the git prune command, objects that have no pointers are deleted. Usage:

git prune

git fsck

Use the git fsck command to perform a check of the git file system integrity. It identifies all damaged objects:

git fsck

git rebase

Use the git rebase command to apply commits in another branch. For example:

git rebase master

Conclusion

In conclusion, Git is an essential tool for software development that enables developers to collaborate on projects efficiently. With Git, users can track changes to files, compare different versions, and revert to previous versions if necessary. For more information on Git, see the book "Pro Git" by Scott Chacon. In this cheat sheet, I covered some of the most commonly used Git commands, from creating a repository with git init to applying commits in another branch with git rebase. By mastering these commands, you'll be able to efficiently use Git for your software development needs.