Repository: git-tips/tips

Stars: 21684

README.md Copy Chapter

git-tips Copy Chapter

Collection of git-tips, want to add your tips? Checkout contributing.md

English | 中文 | Русский | 한국어 | Tiếng Việt | 日本語 | नेपाली | Polski | فارسی

__Tools:__ Copy Section

* git-tip - A handy CLI to make optimum use of these tips. (Here in Docker container)

📖 Read the interactive GitBook documentation here!

P.S: All these commands are tested on git version 2.7.4 (Apple Git-66).

Table of Contents Copy Chapter

* Basic Operations
* List of all files till a commit
* Quickly switch to the previous branch
* Delete remote branch
* Delete remote tag
* Undo local changes with the content in index(staging)
* Reword the previous commit message
* See commit history for just the current branch
* Amend author.
* Stage parts of a changed file, instead of the entire file
* Pick commits across branches using cherry-pick
* Grab a single file from a stash
* Create new working tree from a repository (git 2.5)
* Create new working tree from HEAD state
* Show all commits in the current branch yet to be merged to master
* Modify previous commit without modifying the commit message
* Prunes references to remove branches that have been deleted in the remote.
* Retrieve the commit hash of the initial revision.
* Import from a bundle
* Ignore one file on commit (e.g. Changelog).
* Fetch pull request by ID to a local branch
* Restore deleted file.
* Restore file to a specific commit-hash
* Marks your commit as a fix of a previous commit.
* Skip staging area during commit.
* Interactive staging.
* Status of ignored files.
* Checkout a new branch without any history
* Find guilty with binary search
* Bypass pre-commit and commit-msg githooks
* Clone a single branch
* Create and switch new branch
* Show all local branches ordered by recent commits
* Clone a shallow copy of a repository
* Force push to Remote Repository
* Group commits by authors and title
* Forced push but still ensure you don't overwrite other's work
* Number of commits in a branch
* Add object notes
* Apply commit from another repository
* Specific fetch reference
* Generates a summary of pending changes
* Show git status short
* Checkout a commit prior to a day ago
* Push the current branch to the same name on the remote repository
* Push a new local branch to remote repository and track
* Update a submodule to the latest commit
* Duplicating a repository
* Branching
* List all branches that are already merged into master
* Remove branches that have already been merged with master
* List all branches and their upstreams, as well as last commit on branch
* Track upstream branch
* Delete local branch
* Get list of all local and remote branches
* Get only remote branches
* Find out branches containing commit-hash
* Rename a branch
* Archive the master branch
* Delete local branches that has been squash and merged in the remote.
* Export a branch with history to a file.
* Get the name of current branch.
* Show the most recent tag on the current branch.
* List all branch is WIP
* Preformatted patch file.
* Switch to a branch (modern alternative to checkout)
* Log and History
* Show helpful guides that come with Git
* Search change by content
* Show changes over time for specific file
* List all the conflicted files
* List of all files changed in a commit
* Unstaged changes since last commit
* Changes staged for commit
* Show both staged and unstaged changes
* What changed since two weeks?
* See all commits made since forking from master
* Show all tracked files
* Show all untracked files
* Show all ignored files
* Visualize the version tree.
* Visualize the tree including commits that are only referenced from reflogs
* Show inline word diff.
* Show changes using common diff tools.
* Commits in Branch1 that are not in Branch2
* List n last commits
* Open all conflicted files in an editor.
* View the GPG signatures in the commit log
* Extract file from another branch.
* List only the root and merge commits.
* List commits and changes to a specific file (even through renaming)
* Search Commit log across all branches for given text
* Get first commit in a branch (from master)
* Show the author, time and last revision made to each line of a given file
* Show how many lines does an author contribute
* Show all the git-notes
* List unpushed git commits
* Add everything, but whitespace changes
* blame on certain range
* Show a Git logical variable.
* Get the repo name.
* logs between date range
* Exclude author from logs
* View expanded details of changes in last commit
* Visualize each position of HEAD in the last 30 days
* Merging and Rebasing
* Rebases 'feature' to 'master' and merges it in to master
* Stash changes before rebasing
* Squash fixup commits normal commits.
* Change previous two commits with an interactive rebase.
* Find common ancestor of two branches
* Change a branch base
* Miscellaneous
* Everyday Git in twenty commands or so
* Untrack files without deleting
* Don’t consider changes for tracked file.
* Check if the change was a part of a release.
* List ignored files.
* Count unpacked number of objects and their disk consumption.
* Prune all unreachable objects from the object database.
* Instantly browse your working repository in gitweb.
* Find lines matching the pattern (regex or string) in tracked files
* Backup untracked files.
* Send a collection of patches as emails
* Remotes
* Changing a remote's URL
* Get list of all remote references
* Adding Remote name
* List all currently configured remotes
* List references in a remote repository
* Refresh the list of remote branches
* Setup and Config
* Remove sensitive data from history, after a push
* Reset author, after author has been changed in the global config.
* Get git bash completion
* Git Aliases
* Always rebase instead of merge on pull.
* List all the alias and configs.
* Make git case sensitive.
* Add custom editors.
* Auto correct typos.
* Reuse recorded resolution, record and reuse previous conflicts resolutions.
* Remove entry in the global config.
* Ignore file mode changes on commits
* Turn off git colored terminal output
* Specific color settings
* Alias: git undo
* [Edit [local/global] git config](#edit-localglobal-git-config)
* List all git aliases
* Use SSH instead of HTTPs for remotes
* Prevent auto replacing LF with CRLF
* Edit config for each level
* Stashing
* Saving current state of tracked files without committing
* Saving current state of unstaged changes to tracked files
* Saving current state including untracked files
* Saving current state with message
* Saving current state of all files (ignored, untracked, and tracked)
* Show list of all saved stashes
* Show the contents of any stash in patch form
* Apply any stash without deleting from the stashed list
* Apply last stashed state and delete it from stashed list
* Delete all stored stashes
* Submodules and Subtrees
* Update all the submodules
* Deploying git tracked subfolder to gh-pages
* Adding a project to repo using subtree
* Get latest changes in your repo for a linked project using subtree
* Tagging
* Create local tag
* Delete local tag
* Undoing Changes
* Sync with remote, overwrite local changes
* Git reset first commit
* Reset: preserve uncommitted local changes
* Revert: Undo a commit by creating a new commit
* Reset: Discard commits, advised for private branch
* Before deleting untracked files/directory, do a dry run to get the list of these files/directories
* Forcefully remove untracked files
* Forcefully remove untracked directory
* Undo assume-unchanged.
* Clean the files from .gitignore.
* Dry run. (any command that supports dry-run flag should do.)
* Unstaging Staged file
* Revert: Reverting an entire merge
* Restore file (modern alternative to reset/checkout --)

Basic Operations Copy Chapter

List of all files till a commit Copy Section

git ls-tree --name-only -r <commit-ish>

Quickly switch to the previous branch Copy Section

git checkout -

git checkout @{-1}

Delete remote branch Copy Section

git push origin --delete <remote_branchname>

git push origin :<remote_branchname>

git branch -dr <remote/branch>

Delete remote tag Copy Section

git push origin :refs/tags/<tag-name>

Undo local changes with the content in index(staging) Copy Section

git checkout -- <file_name>

Reword the previous commit message Copy Section

git commit -v --amend

See commit history for just the current branch Copy Section

git cherry -v master

Amend author. Copy Section

git commit --amend --author='Author Name <[email protected]>'

Stage parts of a changed file, instead of the entire file Copy Section

git add -p

Pick commits across branches using cherry-pick Copy Section

git checkout <branch-name> && git cherry-pick <commit-ish>

Grab a single file from a stash Copy Section

git checkout <stash@{n}> -- <file_path>

git checkout stash@{0} -- <file_path>

Create new working tree from a repository (git 2.5) Copy Section

git worktree add -b <branch-name> <path> <start-point>

Create new working tree from HEAD state Copy Section

git worktree add --detach <path> HEAD

Show all commits in the current branch yet to be merged to master Copy Section

git cherry -v master

git cherry -v master <branch-to-be-merged>

Modify previous commit without modifying the commit message Copy Section

git add --all && git commit --amend --no-edit

Prunes references to remove branches that have been deleted in the remote. Copy Section

git fetch -p

git remote prune origin

Retrieve the commit hash of the initial revision. Copy Section

git rev-list --reverse HEAD | head -1

git rev-list --max-parents=0 HEAD

git log --pretty=oneline | tail -1 | cut -c 1-40

git log --pretty=oneline --reverse | head -1 | cut -c 1-40

Import from a bundle Copy Section

git clone repo.bundle <repo-dir> -b <branch-name>

Ignore one file on commit (e.g. Changelog). Copy Section

git update-index --assume-unchanged Changelog; git commit -a; git update-index --no-assume-unchanged Changelog

Fetch pull request by ID to a local branch Copy Section

git fetch origin pull/<id>/head:<branch-name>

git pull origin pull/<id>/head:<branch-name>

Restore deleted file. Copy Section

git checkout <deleting_commit> -- <file_path>

Restore file to a specific commit-hash Copy Section

git checkout <commit-ish> -- <file_path>

Marks your commit as a fix of a previous commit. Copy Section

git commit --fixup <SHA-1>

Skip staging area during commit. Copy Section

git commit --only <file_path>

Interactive staging. Copy Section

git add -i

Status of ignored files. Copy Section

git status --ignored

Checkout a new branch without any history Copy Section

git checkout --orphan <branch_name>

Find guilty with binary search Copy Section

git bisect start                    # Search start 
git bisect bad                      # Set point to bad commit 
git bisect good v2.6.13-rc2         # Set point to good commit|tag 
git bisect bad                      # Say current state is bad 
git bisect good                     # Say current state is good 
git bisect reset                    # Finish search

Bypass pre-commit and commit-msg githooks Copy Section

git commit --no-verify

Clone a single branch Copy Section

git clone -b <branch-name> --single-branch https://github.com/user/repo.git

Create and switch new branch Copy Section

git checkout -b <branch-name>

git branch <branch-name> && git checkout <branch-name>

git switch -c <branch-name>

Show all local branches ordered by recent commits Copy Section

git for-each-ref --sort=-committerdate --format='%(refname:short)' refs/heads/

Clone a shallow copy of a repository Copy Section

git clone https://github.com/user/repo.git --depth 1

Force push to Remote Repository Copy Section

git push -f <remote-name> <branch-name>

Group commits by authors and title Copy Section

git shortlog

Forced push but still ensure you don't overwrite other's work Copy Section

git push --force-with-lease <remote-name> <branch-name>

Number of commits in a branch Copy Section

git rev-list --count <branch-name>

Add object notes Copy Section

git notes add -m 'Note on the previous commit....'

Apply commit from another repository Copy Section

git --git-dir=<source-dir>/.git format-patch -k -1 --stdout <SHA1> | git am -3 -k

Specific fetch reference Copy Section

git fetch origin master:refs/remotes/origin/mymaster

Generates a summary of pending changes Copy Section

git request-pull v1.0 https://git.ko.xz/project master:for-linus

Show git status short Copy Section

git status --short --branch

Checkout a commit prior to a day ago Copy Section

git checkout master@{yesterday}

Push the current branch to the same name on the remote repository Copy Section

git push origin HEAD

Push a new local branch to remote repository and track Copy Section

git push -u origin <branch_name>

Update a submodule to the latest commit Copy Section

cd <path-to-submodule>
git pull origin <branch>
cd <root-of-your-main-project>
git add <path-to-submodule>
git commit -m "submodule updated"

Duplicating a repository Copy Section

git clone --bare https://github.com/exampleuser/old-repository.git
git push --mirror https://github.com/exampleuser/new-repository.git

Branching Copy Chapter

List all branches that are already merged into master Copy Section

git branch --merged master

Remove branches that have already been merged with master Copy Section

git branch --merged master | grep -v '^\*' | xargs -n 1 git branch -d

git branch --merged master | grep -v '^\*\|  master' | xargs -n 1 git branch -d # will not delete master if master is not checked out

List all branches and their upstreams, as well as last commit on branch Copy Section

git branch -vv

Track upstream branch Copy Section

git branch -u origin/mybranch

Delete local branch Copy Section

git branch -d <local_branchname>

Get list of all local and remote branches Copy Section

git branch -a

Get only remote branches Copy Section

git branch -r

Find out branches containing commit-hash Copy Section

git branch -a --contains <commit-ish>

git branch --contains <commit-ish>

Rename a branch Copy Section

git branch -m <new-branch-name>

git branch -m [<old-branch-name>] <new-branch-name>

Archive the master branch master branch')" title="Copy section prompt for LLMs"> Copy Section

git archive master --format=zip --output=master.zip

Delete local branches that has been squash and merged in the remote. Copy Section

git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -D

Export a branch with history to a file. Copy Section

git bundle create <file> <branch-name>

Get the name of current branch. Copy Section

git rev-parse --abbrev-ref HEAD

Show the most recent tag on the current branch. Copy Section

git describe --tags --abbrev=0

List all branch is WIP Copy Section

git checkout master && git branch --no-merged

Preformatted patch file. Copy Section

git format-patch -M upstream..topic

Switch to a branch (modern alternative to checkout) Copy Section

git switch <branch-name>

git switch -c <new-branch-name>

Log and History Copy Chapter

Show helpful guides that come with Git Copy Section

git help -g

Search change by content Copy Section

git log -S'<a term in the source>'

Show changes over time for specific file Copy Section

git log -p <file_name>

List all the conflicted files Copy Section

git diff --name-only --diff-filter=U

List of all files changed in a commit Copy Section

git diff-tree --no-commit-id --name-only -r <commit-ish>

Unstaged changes since last commit Copy Section

git diff

Changes staged for commit Copy Section

git diff --cached

git diff --staged

Show both staged and unstaged changes Copy Section

git diff HEAD

What changed since two weeks? Copy Section

git log --no-merges --raw --since='2 weeks ago'

git whatchanged --since='2 weeks ago'

See all commits made since forking from master Copy Section

git log --no-merges --stat --reverse master..

Show all tracked files Copy Section

git ls-files -t

Show all untracked files Copy Section

git ls-files --others

Show all ignored files Copy Section

git ls-files --others -i --exclude-standard

Visualize the version tree. Copy Section

git log --pretty=oneline --graph --decorate --all

gitk --all

git log --graph --pretty=format:'%C(auto) %h | %s | %an | %ar%d'

Visualize the tree including commits that are only referenced from reflogs Copy Section

git log --graph --decorate --oneline $(git rev-list --walk-reflogs --all)

Show inline word diff. Copy Section

git diff --word-diff

Show changes using common diff tools. Copy Section

git difftool [-t <tool>] <commit1> <commit2> <path>

Commits in Branch1 that are not in Branch2 Copy Section

git log Branch1 ^Branch2

List n last commits Copy Section

git log -<n>

git log -n <n>

Open all conflicted files in an editor. Copy Section

git diff --name-only | uniq | xargs $EDITOR

View the GPG signatures in the commit log Copy Section

git log --show-signature

Extract file from another branch. Copy Section

git show <branch_name>:<file_name>

List only the root and merge commits. Copy Section

git log --first-parent

List commits and changes to a specific file (even through renaming) Copy Section

git log --follow -p -- <file_path>

Search Commit log across all branches for given text Copy Section

git log --all --grep='<given-text>'

Get first commit in a branch (from master) Copy Section

git log --oneline master..<branch-name> | tail -1

git log --reverse master..<branch-name> | head -6

Show the author, time and last revision made to each line of a given file Copy Section

git blame <file-name>

Show how many lines does an author contribute Copy Section

git log --author='_Your_Name_Here_' --pretty=tformat: --numstat | gawk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf "added lines: %s removed lines: %s total lines: %s
", add, subs, loc }' -

git log --author='_Your_Name_Here_' --pretty=tformat: --numstat | awk '{ add += $1; subs += $2; loc += $1 - $2 } END { printf "added lines: %s, removed lines: %s, total lines: %s
", add, subs, loc }' - # on Mac OSX

Show all the git-notes Copy Section

git log --show-notes='*'

List unpushed git commits Copy Section

git log --branches --not --remotes

git log @{u}..

git cherry -v

Add everything, but whitespace changes Copy Section

git diff --ignore-all-space | git apply --cached

blame on certain range Copy Section

git blame -L <start>,<end>

Show a Git logical variable. Copy Section

git var -l | <variable>

Get the repo name. Copy Section

git rev-parse --show-toplevel

logs between date range Copy Section

git log --since='FEB 1 2017' --until='FEB 14 2017'

Exclude author from logs Copy Section

git log --perl-regexp --author='^((?!excluded-author-regex).*)$'

View expanded details of changes in last commit Copy Section

git show

Visualize each position of HEAD in the last 30 days Copy Section

git reflog

Merging and Rebasing Copy Chapter

Rebases 'feature' to 'master' and merges it in to master Copy Section

git rebase master feature && git checkout master && git merge -

Stash changes before rebasing Copy Section

git rebase --autostash

Squash fixup commits normal commits. Copy Section

git rebase -i --autosquash

Change previous two commits with an interactive rebase. Copy Section

git rebase --interactive HEAD~2

Find common ancestor of two branches Copy Section

git merge-base <branch-name> <other-branch-name>

Change a branch base Copy Section

git rebase --onto <new_base> <old_base>

Miscellaneous Copy Chapter

Everyday Git in twenty commands or so Copy Section

git help everyday

Untrack files without deleting Copy Section

git rm --cached <file_path>

git rm --cached -r <directory_path>

Don’t consider changes for tracked file. Copy Section

git update-index --assume-unchanged <file_name>

Check if the change was a part of a release. Copy Section

git name-rev --name-only <SHA-1>

List ignored files. Copy Section

git check-ignore *

Count unpacked number of objects and their disk consumption. Copy Section

git count-objects --human-readable

Prune all unreachable objects from the object database. Copy Section

git gc --prune=now --aggressive

Instantly browse your working repository in gitweb. Copy Section

git instaweb [--local] [--httpd=<httpd>] [--port=<port>] [--browser=<browser>]

Find lines matching the pattern (regex or string) in tracked files Copy Section

git grep --heading --line-number 'foo bar'

Backup untracked files. Copy Section

git ls-files --others -i --exclude-standard | xargs zip untracked.zip

Send a collection of patches as emails Copy Section

git send-email [<options>] <file|directory>…
git send-email [<options>] <format-patch options>

Remotes Copy Chapter

Changing a remote's URL Copy Section

git remote set-url origin <URL>

Get list of all remote references Copy Section

git remote

git remote show

Adding Remote name Copy Section

git remote add <remote-nickname> <remote-url>

List all currently configured remotes Copy Section

git remote -v

List references in a remote repository Copy Section

git ls-remote git://git.kernel.org/pub/scm/git/git.git

Refresh the list of remote branches Copy Section

git remote update origin --prune

Setup and Config Copy Chapter

Remove sensitive data from history, after a push Copy Section

git filter-branch --force --index-filter 'git rm --cached --ignore-unmatch <path-to-your-file>' --prune-empty --tag-name-filter cat -- --all && git push origin --force --all

Reset author, after author has been changed in the global config. Copy Section

git commit --amend --reset-author --no-edit

Get git bash completion Copy Section

curl -L http://git.io/vfhol > ~/.git-completion.bash && echo '[ -f ~/.git-completion.bash ] && . ~/.git-completion.bash' >> ~/.bashrc

Git Aliases Copy Section

git config --global alias.<handle> <command> 
git config --global alias.st status

Always rebase instead of merge on pull. Copy Section

git config --global pull.rebase true

#git < 1.7.9
git config --global branch.autosetuprebase always

List all the alias and configs. Copy Section

git config --list

Make git case sensitive. Copy Section

git config --global core.ignorecase false

Add custom editors. Copy Section

git config --global core.editor '$EDITOR'

Auto correct typos. Copy Section

git config --global help.autocorrect 1

Reuse recorded resolution, record and reuse previous conflicts resolutions. Copy Section

git config --global rerere.enabled 1

Remove entry in the global config. Copy Section

git config --global --unset <entry-name>

Ignore file mode changes on commits Copy Section

git config core.fileMode false

Turn off git colored terminal output Copy Section

git config --global color.ui false

Specific color settings Copy Section

git config --global <specific command e.g branch, diff> <true, false or always>

Alias: git undo Copy Section

git config --global alias.undo '!f() { git reset --hard $(git rev-parse --abbrev-ref HEAD)@{${1-1}}; }; f'

Edit [local/global] git config Copy Section

git config [--global] --edit

List all git aliases Copy Section

git config -l | grep alias | sed 's/^alias\.//g'

git config -l | grep alias | cut -d '.' -f 2

Use SSH instead of HTTPs for remotes Copy Section

git config --global url.'[email protected]:'.insteadOf 'https://github.com/'

Prevent auto replacing LF with CRLF Copy Section

git config --global core.autocrlf false

Edit config for each level Copy Section

git config --edit --system
git config --edit --global
git config --edit --local

Stashing Copy Chapter

Saving current state of tracked files without committing Copy Section

git stash

git stash push

Saving current state of unstaged changes to tracked files Copy Section

git stash -k

git stash --keep-index

git stash push --keep-index

Saving current state including untracked files Copy Section

git stash -u

git stash push -u

git stash push --include-untracked

Saving current state with message Copy Section

git stash push -m <message>

git stash push --message <message>

Saving current state of all files (ignored, untracked, and tracked) Copy Section

git stash -a

git stash --all

git stash push --all

Show list of all saved stashes Copy Section

git stash list

Show the contents of any stash in patch form Copy Section

git stash show -p <stash@{n}>

Apply any stash without deleting from the stashed list Copy Section

git stash apply <stash@{n}>

Apply last stashed state and delete it from stashed list Copy Section

git stash pop

git stash apply stash@{0} && git stash drop stash@{0}

Delete all stored stashes Copy Section

git stash clear

git stash drop <stash@{n}>

Submodules and Subtrees Copy Chapter

Update all the submodules Copy Section

git submodule foreach git pull

git submodule update --init --recursive

git submodule update --remote

Deploying git tracked subfolder to gh-pages Copy Section

git subtree push --prefix subfolder_name origin gh-pages

git subtree push --prefix subfolder_name origin branch_name

Adding a project to repo using subtree Copy Section

git subtree add --prefix=<directory_name>/<project_name> --squash [email protected]:<username>/<project_name>.git master

Get latest changes in your repo for a linked project using subtree Copy Section

git subtree pull --prefix=<directory_name>/<project_name> --squash [email protected]:<username>/<project_name>.git master

Tagging Copy Chapter

Create local tag Copy Section

git tag <tag-name>

Delete local tag Copy Section

git tag -d <tag-name>

Undoing Changes Copy Chapter

Sync with remote, overwrite local changes Copy Section

git fetch origin && git reset --hard origin/master && git clean -f -d

Git reset first commit Copy Section

git update-ref -d HEAD

Reset: preserve uncommitted local changes Copy Section

git reset --keep <commit>

Revert: Undo a commit by creating a new commit Copy Section

git revert <commit-ish>

Reset: Discard commits, advised for private branch Copy Section

git reset <commit-ish>

Before deleting untracked files/directory, do a dry run to get the list of these files/directories Copy Section

git clean -n

Forcefully remove untracked files Copy Section

git clean -f

Forcefully remove untracked directory Copy Section

git clean -f -d

Undo assume-unchanged. Copy Section

git update-index --no-assume-unchanged <file_name>

Clean the files from .gitignore. .gitignore.')" title="Copy section prompt for LLMs"> Copy Section

git clean -X -f

Dry run. (any command that supports dry-run flag should do.) Copy Section

git clean -fd --dry-run

Unstaging Staged file Copy Section

git reset HEAD <file-name>

Revert: Reverting an entire merge Copy Section

git revert -m 1 <commit-ish>

Restore file (modern alternative to reset/checkout --) Copy Section

git restore <file-name>

git restore --staged <file-name>