Md-Mahir-Asef / git-cheatsheet

This is a cheat sheet for git commands and git workflows.

Git Cheatsheet

This is a cheat sheet for git commands and git workflows.

Common Git Commands

Branches

1. Create a new branch and checkout to that:

git checkout -b branch-name

2. Checkout to an existing branch:

git checkout branch-name

3. Delete a branch:

git branch -D branch-name

4. List only local branches:

git branch

5. List only remote branches:

git branch -r

6. List all branches (local + Remote):

git branch -a

7. Show branches with last commit info (more detailed):

git branch -vv

Status

Command:

git status

Example Response:

On branch feature/responsive-util-menu
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   client/src/components/UtilMenu.tsx

no changes added to commit (use "git add" and/or "git commit -a")

Git Workflows

Git Branch Workflow

1. Check out from the current branch and create a new branch.

git checkout -b type/name

2. After finishing the work

git add .
git commit -m "type: short description about the work you have done."

3. Push the branch to the remote so it is backed up.

git push -u origin type/name

4. Then open a PR (Pull Request) if you are done.
5. Merge to main according to team rules and permissions.

If you need to back out before the merge.

You can easily come back because your main is untouched.

git checkout main

You can again go to the main branch.

git checkout main

You can also delete the previous branch.

git branch -D type/name