Git Cheat Sheet with 40+ commands & concepts

By Md Shoriful Islam

Git Cheat Sheet with 40+ commands & concepts


Tired of memorizing git commands? Here is a cheat sheet with 40+ commands to simplify your life.


1. Initialize a local repository

git init <directory>

The <directory> is optional. If you don't specify it, the current directory will be used.


2. Clone a remote repository

git clone <url>

3. Add a file to the staging area

git add <file>

To add all files in the current directory, use . in place of <file>.

git add .

4. Commit changes

git commit -m "<message>"

If you want to add all changes made to tracked files & commit

git commit -a -m "<message>"


# or


git commit -am "<message>"

5. Remove a file from the staging area

git reset <file>

6. Move or rename a file

git mv <current path> <new path>

7. Remove a file from the repository

git rm <file>

You can also remove it from staging area only using --cached flag

git rm --cached <file>

Basic Git Concepts

Default branch name: main

Default remote name: origin

Current branch reference: HEAD

Parent of HEAD: HEAD^ or HEAD~1

Grandparent of HEAD: HEAD^^ or HEAD~2

13. Display branches

git branch

Useful flags:


-a: Display all branches (local & remote)

-r: Display remote branches

-v: Display branches with last commit

14. Create a branch

git branch <branch>

You can create a branch and switch to it using the checkout command.

git checkout -b <branch>

15. Switch to a branch

git checkout <branch>

16. Delete a branch

git branch -d <branch>

You can also force delete a branch using the -D flag.

git branch -D <branch>

17. Merge a branch

git merge <branch to merge into HEAD>

Useful flags:


--no-ff: Create a merge commit even if the merge resolves as a fast-forward

--squash: Squash all commits from the specified branch into a single commit

Fast forward Merge

Fast-forward-merge


Non-Fast forward Merge

No-fast-forward-merge


It is suggested to not use the --squash flag as it will squash all commits into a single commit, leading to a messy commit history.


18. Rebase a branch

Rebasing is the process of moving or combining a sequence of commits to a new base commit


Rebase

git rebase <branch to rebase from>

19. Checkout a previous commit

git checkout <commit id>

20. Revert a commit

git revert <commit id>

21. Reset a commit

git reset <commit id>

You can also add the --hard flag to delete all changes, but use it with caution.

git reset --hard <commit id>

22. Check out the status of the repository

git status

23. Display the commit history

git log

24. Display the changes to unstaged files

git diff

You can also use the --staged flag to display the changes to staged files.

git diff --staged

25. Display the changes between two commits

git diff <commit id 01> <commit id 02>

26. Stash changes

The stash allows you to temporarily store changes without committing them.

git stash

You can also add a message to the stash.

git stash save "<message>"

27. List stashes

git stash list

28. Apply a stash

Applying the stash will NOT remove it from the stash list.

git stash apply <stash id>

If you do not specify the <stash id>, the latest stash will be applied (Valid for all similar stash commands)


You can also use the format stash@{<index>} to apply a stash (Valid for all similar stash commands)

git stash apply stash@{0}

29. Remove a stash

git stash drop <stash id>

30. Remove all stashes

git stash clear

31. Apply and remove a stash

git stash pop <stash id>

32. Display the changes in a stash

git stash show <stash id>

33. Add a remote repository

git remote add <remote name> <url>

34. Display remote repositories

git remote

Add a -v flag to display the URLs of the remote repositories.

git remote -v

35. Remove a remote repository

git remote remove <remote name>

36 Rename a remote repository

git remote rename <old name> <new name>

37. Fetch changes from a remote repository

git fetch <remote name>

38. Fetch changes from a particular branch

git fetch <remote name> <branch>

39. Pull changes from a remote repository

git pull <remote name> <branch>

40. Push changes to a remote repository

git push <remote name>

41. Push changes to a particular branch

git push <remote name> <branch>

That's all folks! 🎉


Thanks for reading

Comments

Post a Comment

Popular posts from this blog

Whiteboarding Interviews

By Md Shoriful Islam
Image
 ⭕ Whiteboarding interviews are a common way of assessing the technical and non-technical skills of candidates for software development positions. They involve solving a coding problem or designing a system on a whiteboard, either in person or virtually, while explaining your approach and reasoning to the interviewer.  ⭕ Some of the benefits of whiteboarding interviews are that they can test your problem-solving ability, communication skills, and coding proficiency in a realistic scenario. They can also help you demonstrate your creativity, collaboration, and passion for the role. However, some of the drawbacks of whiteboarding interviews are that they can be stressful, artificial, and biased. They can also favor memorization over understanding and overlook other aspects of your skills and experience.  ⭕ If you want to ace a whiteboarding interview, you should practice beforehand, prepare for the interview setting, set objectives and expectations, create a good candidate ...
Read more

Version Control with Git: A Beginner’s Guide

By Md Shoriful Islam
Version Control with Git: A Beginner’s Guide If you are a developer, you probably know how important it is to keep track of your code changes and collaborate with other developers on a project. But how do you do that effectively and efficiently? The answer is version control. Version control is a system that records changes to a file or set of files over time so that you can recall specific versions later. It allows you to revert files back to a previous state, compare changes over time, see who last modified something, and more. Version control also enables you to work with other developers on the same code base without stepping on each other’s toes. One of the most popular version control systems in the world is Git. Git is a free and open source distributed version control system that is designed to handle everything from small to very large projects with speed and efficiency. Git has many features that make it superior to other version control systems, such as: Cheap local branchin...
Read more

Callback function in JavaScript

By Md Shoriful Islam
Image
Callback function in JavaScript What is a callback function in JavaScript? A callback function is a function that is passed as an argument to another function and is executed after the first function has completed its task. Callback functions are useful for handling asynchronous events, such as network requests, file operations, or timers. For example, you can use a callback function to display the result of a calculation after the calculation is done. Callback function in JavaScript Here is a simple example of a callback function in JavaScript: // Define a function that takes a callback as an argument function sayHello (callback) { // Do some task console .log ("Hello, world!"); // Invoke the callback function callback (); } // Define another function function sayGoodbye () { // Do some task console .log ("Goodbye, world!"); } // Call the first function and pass the second function as a callback sayHello (sayGoodbye); // The output will be: // Hello, wo...
Read more