Suggest edit — git-tips

Title

Name

Note

---
visibility: public
---

# Git Tips

**repo:** [git-tips/tips](https://github.com/git-tips/tips)  
**category:** [[development-environment|Development Environment]]
**related:** [[tips|Tips]] · [[git-add-ons|Git Add Ons]]

---

## git-tips
> Collection of `git-tips`, want to add your tips? Checkout [contributing.md](./contributing.md)

[English](http://git.io/git-tips) | [中文](https://github.com/521xueweihan/git-tips) | [Русский](https://github.com/Imangazaliev/git-tips) | [한국어](https://github.com/mingrammer/git-tips) | [Tiếng Việt](https://github.com/hprobotic/git-tips) | [日本語](https://github.com/isotai/git-tips) | [नेपाली](https://github.com/amarduwal/git-tips) | [Polski](https://github.com/mbiesiad/tips) | [فارسی](https://github.com/javadnikbakht/git-tips)

### __Tools:__

* [git-tip](https://www.npmjs.com/package/git-tip) - A handy CLI to make optimum use of these [tips](/@harrisonqian/awesome/wiki/programming-languages/tips). ([Here in [Docker](/@harrisonqian/awesome/wiki/back-end-development/docker) container](https://github.com/djoudi5/docker-git-tip))

📖 **[Read the interactive GitBook documentation here!](https://git-tips.github.io/tips/)**

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

## Table of Contents

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

## Basic Operations

### List of all files till a commit
```sh
git ls-tree --name-only -r <commit-ish>
```

### Quickly switch to the previous branch
```sh
git checkout -
```
**Alternatives:**
```sh
git checkout @{-1}
```

### Delete remote branch
```sh
git push origin --delete <remote_branchname>
```
**Alternatives:**
```sh
git push origin :<remote_branchname>
```
```sh
git branch -dr <remote/branch>
```

### Delete remote tag
```sh
git push origin :refs/tags/<tag-name>
```

### Undo local changes with the content in index(staging)
```sh
git checkout -- <file_name>
```

### Reword the previous commit message
```sh
git commit -v --amend
```

### See commit history for just the current branch
```sh
git cherry -v master
```

### Amend author.
```sh
git commit --amend --author='Author Name <email@address.com>'
```

### Stage parts of a changed file, instead of the entire file
```sh
git add -p
```

### Pick commits across branches using cherry-pick
```sh
git checkout <branch-name> && git cherry-pick <commit-ish>
```

### Grab a single file from a stash
```sh
git checkout <stash@{n}> -- <file_path>
```
**Alternatives:**
```sh
git checkout stash@{0} -- <file_path>
```

### Create new working tree from a repository (git 2.5)
```sh
git worktree add -b <branch-name> <path> <start-point>
```

### Create new working tree from HEAD state
```sh
git worktree add --detach <path> HEAD
```

### Show all commits in the current branch yet to be merged to master
```sh
git cherry -v master
```
**Alternatives:**
```sh
git cherry -v master <branch-to-be-merged>
```

### Modify previous commit without modifying the commit message
```sh
git add --all && git commit --amend --no-edit
```

### Prunes references to remove branches that have been deleted in the remote.
```sh
git fetch -p
```
**Alternatives:**
```sh
git remote prune origin
```

### Retrieve the commit hash of the initial revision.
```sh
 git rev-list --reverse HEAD | head -1
```
**Alternatives:**
```sh
git rev-list --max-parents=0 HEAD
```
```sh
git log --pretty=oneline | tail -1 | cut -c 1-40
```
```sh
git log --pretty=oneline --reverse | head -1 | cut -c 1-40
```

### Import from a bundle
```sh
git clone repo.bundle <repo-dir> -b <branch-name>
```

### Ignore one file on commit (e.g. Changelog).
```sh
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
```sh
git fetch origin pull/<id>/head:<branch-name>
```
**Alternatives:**
```sh
git pull origin pull/<id>/head:<branch-name>
```

### Restore deleted file.
```sh
git checkout <deleting_commit> -- <file_path>
```

### Restore file to a specific commit-hash
```sh
git checkout <commit-ish> -- <file_path>
```

### Marks your commit as a fix of a previous commit.
```sh
git commit --fixup <SHA-1>
```

### Skip staging area during commit.
```sh
git commit --only <file_path>
```

### Interactive staging.
```sh
git add -i
```

### Status of ignored files.
```sh
git status --ignored
```

### Checkout a new branch without any history
```sh
git checkout --orphan <branch_name>
```

### Find guilty with binary search
```sh
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
```sh
git commit --no-verify
```

### Clone a single branch
```sh
git clone -b <branch-name> --single-branch https://github.com/user/repo.git
```

### Create and switch new branch
```sh
git checkout -b <branch-name>
```
**Alternatives:**
```sh
git branch <branch-name> && git checkout <branch-name>
```
```sh
git switch -c <branch-name>
```

### Show all local branches ordered by recent commits
```sh
git for-each-ref --sort=-committerdate --format='%(refname:short)' refs/heads/
```

### Clone a shallow copy of a repository
```sh
git clone https://github.com/user/repo.git --depth 1
```

### Force push to Remote Repository
```sh
git push -f <remote-name> <branch-name>
```

### Group commits by authors and title
```sh
git shortlog
```

### Forced push but still ensure you don't overwrite other's work
```sh
git push --force-with-lease <remote-name> <branch-name>
```

### Number of commits in a branch
```sh
git rev-list --count <branch-name>
```

### Add object notes
```sh
git notes add -m 'Note on the previous commit....'
```

### Apply commit from another repository
```sh
git --git-dir=<source-dir>/.git format-patch -k -1 --stdout <SHA1> | git am -3 -k
```

### Specific fetch reference
```sh
git fetch origin master:refs/remotes/origin/mymaster
```

### Generates a summary of pending changes
```sh
git request-pull v1.0 https://git.ko.xz/project master:for-linus
```

### Show git status short
```sh
git status --short --branch
```

### Checkout a commit prior to a day ago
```sh
git checkout master@{yesterday}
```

### Push the current branch to the same name on the remote repository
```sh
git push origin HEAD
```

### Push a new local branch to remote repository and track
```sh
git push -u origin <branch_name>
```

### Update a submodule to the latest commit
```sh
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
```sh
git clone --bare https://github.com/exampleuser/old-repository.git

git push --mirror https://github.com/exampleuser/new-repository.git
```

## Branching

### List all branches that are already merged into master
```sh
git branch --merged master

---
*truncated — [full list on GitHub](https://github.com/git-tips/tips)*