Skip to content

Latest commit

 

History

History
179 lines (138 loc) · 13.6 KB

README.md

File metadata and controls

179 lines (138 loc) · 13.6 KB
Raw

Git-Commands

Introduction

This repository serves as a cheat sheet for common Git commands and best practices. Whether you're a beginner looking to get started with Git or an experienced developer wanting to brush up on your Git skills, you'll find useful information here.

Table of Contents

Basic Git Commands

Setting up Your Git Identity

Command Description Example(s)
git config --global user.name Setup your name in Git git config --global user.name Your-Name
git config --global user.email Setup your mail in Git git config --global user.email [email protected]

Getting started with Git

Command Description Example(s)
git init Initialize empty Git repository git init new-project
git clone Clone a repository from remote server git clone https://github.com/user/repo.git

Committing Changes

Command Description Example(s)
git status Show the status of Working Directory -
git add Add files to staging Area git add file1.txt file2.txt
git add -A Add all new and changed files to staging area -
git commit Commit staged changes git commit -m "latest bug fix"

Branching

Command Description Example(s)
git branch List branches -
git branch <branch-name> Create a new branch git branch feature-branch
git branch -d <branch-name> Delete a merged branch git branch -d feature-branch
git branch -D <branch-name> Delete a branch (Merged or not) git branch -D test-branch
git branch -m <old-branch-name> <new-branch-name> Rename a branch git branch -m feature-branch-v1.0 feature-branch-v2.0
git push origin --delete <branch-name> Delete a remote branch git push origin --delete feature-branch
git checkout <branch-name> Switch to a branch git checkout feature-branch
git checkout -b <branch-name> Create a new branch and switch to it git checkout -b feature-branch
git checkout -- <file-name> Discard changes to a file git checkout -- test.txt
git checkout . Discard all changes in your working directory and revert the files to the last committed state. -

Merging

Command Description Example(s)
git merge <branch-name> Merge a branch git merge feature-branch
git merge <source-branch> <target-branch> Merge a branch into target branch git merge feature-V1 feature-V0
git merge --squash <branch-name> Merge a branch with all commits squashed into single commit git merge --squash feature-V0
git rebase <branch-name> Merge a branch without creating new merge commit, keeps work history clean git rebase feature-branch

Reviewing

Command Description Example(s)
git status Displays the current status of your working directory and staged changes -
git log Displays a detailed commit history of the current branch -
git log --oneline Displays a simplified commit history of the current branch in a compact format -
git diff Shows the differences between your working directory and the most recent commit -
git diff <commit1> <commit2> Compares two commits and displays the differences between them git diff abc123 xyz987

Stashing

Command Description Example(s)
git stash Store modified and staged changes -
git stash save "comment" Stash the modified changes with description git stash save "Work in Progress - Feature 1"
git stash list List all stashes -
git stash apply Applies the most recent stash entry to your working directory, without deleting the stash entry -
git stash pop Applies the most recent stash entry to your working directory and deletes it -
git stash show Show the difference summary of recent stash entry -
git stash drop Delete the recent stash entry without applying it -
git stash clear Delete all stash entries -

Git commands related to remote repositories

Command Description Example(s)
git push Push changes to remote repository -
git pull Fetch the latest changes from the remote repository and merge them with the local one -
git push origin <branch-name> Push a branch to the remote repository git push origin feature-branch
git push origin --delete <branch-name> Delete a remote branch git push origin --delete feature-branch
git fetch origin Fetch the changes from remote repository without merging -
git fetch origin <branch-name> Fetch changes from a remote branch without merging git fetch origin main
git remote View all remote connections -
git remote remove <connection-name> Remove a connection -
git remote rename <old-name> <new-name> Rename a connection -
git pull --rebase origin Rebase local changes on top of new changes from remote repository -

Reverting and Resetting Commands

Command Description Example(s)
git revert <commit> Creates a new commit that undoes the changes introduced by the specified commit git revert abc123
git revert <commit1> <commit2> ... <commit n> Reverts a range of commits, creating new commits that undo the changes introduced by each of them. git revert abc123 xyz987
git reset --soft <commit> Moves the branch pointer to the specified commit, preserving the changes in your working directory and staging area. git reset --soft abc123
git reset --hard <commit> Moves the branch pointer to the specified commit and discards all changes, both in the working directory and staging area (Deletes all commits ahead of it). git reset --hard abc123
git revert <commit> Creates a new commit that undoes the changes introduced by the specified commit git revert abc123
git rm <file> Remove file from Working Directory and staging area git rm test.txt
git rm --cached <file> Remove file from staging area only git rm --cached test.txt

Common Configuration

Command Description Example(s)
git config --global alias.<alias-name> <git command> Configure Git aliases git config --global alias.co checkout
git config --global core.editor Configure default text editor git config --global core.editor "code"
git config --global --edit Edit Git configuration in an editor -

Git Tag

Command Description Example(s)
git tag List all tags in the repository -
git tag <tag-name> Create a new tag git tag v1.0.0
git tag -a <tag-name> -m "message" Create an annotated tag with a message git tag -a v1.0.0 -m "Release version 1.0.0"
git show <tag-name> Show details of a specific tag git show v1.0.0
git push --tags Push tags to remote repository -

Miscellaneous

Command Description Example(s)
git log -S "string" Search git commits with particular string git log -S "feature"
git clean -f Clean all untracked files -
git commit --amend Amends the most recent commit with the new changes -
git show <commit> --stat Displayed a histogram showing inserts, deletions and modifications per file for a specific commit along with general commit information -
git bisect A powerful Git command used to find the commit that introduced a bug or regression in your codebase. It performs a binary search through the commit history to identify the specific commit where the issue was introduced. git bisect start , git bisect good , git bisect bad
git commit --amend Amends the most recent commit with the new changes -
git cherry-pick <commit from another branch> Merges a particular commit from another branch git cherry-pick xyz123
git push --tags Push tags to a remote repository git push --tags
git blame <file> Show who last modified each line of a file git blame myfile.txt
git reflog Show a log of all Git references -
git gc Perform Git garbage collection -
git archive --format=zip --output=filename.zip <branch-name> Create a zip archive of a specific branch git archive --format=zip --output=mybranch.zip main
git grep <text> Search for text in your Git repository git grep "search text"