## git-tips > Collection of `git-tips`, want to add your tips? Checkout [contributing.md](./contributing.md) P.S: All these commands are tested on `git version 2.7.4 (Apple Git-66)`. * [Everyday Git in twenty commands or so](#everyday-git-in-twenty-commands-or-so) * [Show helpful guides that come with Git](#show-helpful-guides-that-come-with-git) * [Overwrite pull](#overwrite-pull) * [List of all files till a commit](#list-of-all-files-till-a-commit) * [Git reset first commit](#git-reset-first-commit) * [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) * [List all branches that are already merged into master](#list-all-branches-that-are-already-merged-into-master) * [Quickly switch to the previous branch](#quickly-switch-to-the-previous-branch) * [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) * [Delete remote branch](#delete-remote-branch) * [Undo local changes with the last content in head](#undo-local-changes-with-the-last-content-in-head) * [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) * [Reword the previous commit message](#reword-the-previous-commit-message) * [Amend author.](#amend-author) * [Reset author, after author has been changed in the global config.](#reset-author-after-author-has-been-changed-in-the-global-config) * [Changing a remote's URL](#changing-a-remotes-url) * [Get list of all remote references](#get-list-of-all-remote-references) * [Get list of all local and remote branches](#get-list-of-all-local-and-remote-branches) * [Get only remote branches](#get-only-remote-branches) * [Stage parts of a changed file, instead of the entire file](#stage-parts-of-a-changed-file-instead-of-the-entire-file) * [Get git bash completion](#get-git-bash-completion) * [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) * [Pick commits across branches using cherry-pick](#pick-commits-across-branches-using-cherry-pick) * [Find out branches containing commit-hash](#find-out-branches-containing-commit-hash) * [Git Aliases](#git-aliases) * [Saving current state of tracked files without commiting](#saving-current-state-of-tracked-files-without-commiting) * [Saving current state including untracked files](#saving-current-state-including-untracked-files) * [Show list of all saved stashes](#show-list-of-all-saved-stashes) * [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) * [Grab a single file from a stash](#grab-a-single-file-from-a-stash) * [Show all tracked files](#show-all-tracked-files) * [Show all untracked files](#show-all-untracked-files) * [Show all ignored files](#show-all-ignored-files) * [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) * [Untrack files without deleting](#untrack-files-without-deleting) * [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) * [Update all the submodules](#update-all-the-submodules) * [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) * [Rename a branch](#rename-a-branch) * [rebases 'feature' to 'master' and merges it in to master ](#rebases-feature-to-master-and-merges-it-in-to-master) * [Archive the `master` branch](#archive-the-master-branch) * [Modify previous commit without modifying the commit message](#modify-previous-commit-without-modifying-the-commit-message) * [Prunes references to remote branches that have been deleted in the remote.](#prunes-references-to-remote-branches-that-have-been-deleted-in-the-remote) * [Retrieve the commit hash of the initial revision.](#retrieve-the-commit-hash-of-the-initial-revision) * [Visualize the version tree.](#visualize-the-version-tree) * [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) * [Export a branch with history to a file.](#export-a-branch-with-history-to-a-file) * [Import from a bundle](#import-from-a-bundle) * [Get the name of current branch.](#get-the-name-of-current-branch) * [Ignore one file on commit (e.g. Changelog).](#ignore-one-file-on-commit-eg-changelog) * [Stash changes before rebasing](#stash-changes-before-rebasing) * [Fetch pull request by ID to a local branch](#fetch-pull-request-by-id-to-a-local-branch) * [Show the most recent tag on the current branch.](#show-the-most-recent-tag-on-the-current-branch) * [Show inline word diff.](#show-inline-word-diff) * [Don’t consider changes for tracked file.](#dont-consider-changes-for-tracked-file) * [Undo assume-unchanged.](#undo-assume-unchanged) * [Clean the files from `.gitignore`.](#clean-the-files-from-gitignore) * [Restore deleted file.](#restore-deleted-file) * [Restore file to a specific commit-hash](#restore-file-to-a-specific-commit-hash) * [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) * [Auto correct typos.](#auto-correct-typos) * [Check if the change was a part of a release.](#check-if-the-change-was-a-part-of-a-release) * [Dry run. (any command that supports dry-run flag should do.)](#dry-run-any-command-that-supports-dry-run-flag-should-do) * [Marks your commit as a fix of a previous commit.](#marks-your-commit-as-a-fix-of-a-previous-commit) * [squash fixup commits normal commits.](#squash-fixup-commits-normal-commits) * [skip staging area during commit.](#skip-staging-area-during-commit) * [List ignored files.](#list-ignored-files) * [Status of ignored files.](#status-of-ignored-files) * [Commits in Branch1 that are not in Branch2](#commits-in-branch1-that-are-not-in-branch2) * [reuse recorded resolution, record and reuse previous conflicts resolutions.](#reuse-recorded-resolution-record-and-reuse-previous-conflicts-resolutions) * [Open all conflicted files in an editor.](#open-all-conflicted-files-in-an-editor) * [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.](#prune-all-unreachable-objects-from-the-object-database) * [Instantly browse your working repository in gitweb.](#instantly-browse-your-working-repository-in-gitweb) * [View the GPG signatures in the commit log](#view-the-gpg-signatures-in-the-commit-log) * [Remove entry in the global config.](#remove-entry-in-the-global-config) * [Checkout a new branch without any history](#checkout-a-new-branch-without-any-history) * [File diff between staging and the last file version.](#file-diff-between-staging-and-the-last-file-version) * [Extract file from another branch.](#extract-file-from-another-branch) * [List only the root and merge commits.](#list-only-the-root-and-merge-commits) * [Merge previous two commits into one.](#merge-previous-two-commits-into-one) * [List all branch is WIP](#list-all-branch-is-wip) * [Find guilty with binary search](#find-guilty-with-binary-search) * [Bypass pre-commit and commit-msg githooks](#bypass-pre-commit-and-commit-msg-githooks) * [List commits and changes to a specific file (even through renaming)](#list-commits-and-changes-to-a-specific-file-even-through-renaming) * [Clone a single branch](#clone-a-single-branch) * [Create and switch new branch](#create-and-switch-new-branch) * [Ignore file mode changes on commits](#ignore-file-mode-changes-on-commits) ## Everyday Git in twenty commands or so ```sh git help everyday ``` ## Show helpful guides that come with Git ```sh git help -g ``` ## Overwrite pull ```sh git fetch --all && git reset --hard origin/master ``` ## List of all files till a commit ```sh git ls-tree --name-only -r ``` ## Git reset first commit ```sh git update-ref -d HEAD ``` ## List all the conflicted files ```sh git diff --name-only --diff-filter=U ``` ## List of all files changed in a commit ```sh git diff-tree --no-commit-id --name-only -r ``` ## Unstaged changes since last commit ```sh git diff ``` ## Changes staged for commit ```sh git diff --cached ``` ## Show both staged and unstaged changes ```sh git diff HEAD ``` ## List all branches that are already merged into master ```sh git branch --merged master ``` ## Quickly switch to the previous branch ```sh git checkout - ``` ## Remove branches that have already been merged with master ```sh git branch --merged master | grep -v '^\*' | xargs -n 1 git branch -d ``` ## List all branches and their upstreams, as well as last commit on branch ```sh git branch -vv ``` ## Track upstream branch ```sh git branch -u origin/mybranch ``` ## Delete local branch ```sh git branch -d ``` ## Delete remote branch ```sh git push origin --delete ``` __Alternatives:__ ```sh git push origin : ``` ## Undo local changes with the last content in head ```sh git checkout -- ``` ## Revert: Undo a commit by creating a new commit ```sh git revert ``` ## Reset: Discard commits, advised for private branch ```sh git reset ``` ## Reword the previous commit message ```sh git commit -v --amend ``` ## Amend author. ```sh git commit --amend --author='Author Name ' ``` ## Reset author, after author has been changed in the global config. ```sh git commit --amend --reset-author --no-edit ``` ## Changing a remote's URL ```sh git remote set-url origin ``` ## Get list of all remote references ```sh git remote ``` __Alternatives:__ ```sh git remote show ``` ## Get list of all local and remote branches ```sh git branch -a ``` ## Get only remote branches ```sh git branch -r ``` ## Stage parts of a changed file, instead of the entire file ```sh git add -p ``` ## Get git bash completion ```sh curl http://git.io/vfhol > ~/.git-completion.bash && echo '[ -f ~/.git-completion.bash ] && . ~/.git-completion.bash' >> ~/.bashrc ``` ## What changed since two weeks? ```sh git log --no-merges --raw --since='2 weeks ago' ``` __Alternatives:__ ```sh git whatchanged --since='2 weeks ago' ``` ## See all commits made since forking from master ```sh git log --no-merges --stat --reverse master.. ``` ## Pick commits across branches using cherry-pick ```sh git checkout && git cherry-pick ``` ## Find out branches containing commit-hash ```sh git branch -a --contains ``` __Alternatives:__ ```sh git branch --contains ``` ## Git Aliases ```sh git config --global alias. git config --global alias.st status ``` ## Saving current state of tracked files without commiting ```sh git stash ``` __Alternatives:__ ```sh git stash save ``` ## Saving current state including untracked files ```sh git stash save -u ``` __Alternatives:__ ```sh git stash save --include-untracked ``` ## Show list of all saved stashes ```sh git stash list ``` ## Apply any stash without deleting from the stashed list ```sh git stash apply ``` ## Apply last stashed state and delete it from stashed list ```sh git stash pop ``` __Alternatives:__ ```sh git stash apply stash@{0} && git stash drop stash@{0} ``` ## Delete all stored stashes ```sh git stash clear ``` __Alternatives:__ ```sh git stash drop ``` ## Grab a single file from a stash ```sh git checkout -- ``` __Alternatives:__ ```sh git checkout stash@{0} -- ``` ## Show all tracked files ```sh git ls-files -t ``` ## Show all untracked files ```sh git ls-files --others ``` ## Show all ignored files ```sh git ls-files --others -i --exclude-standard ``` ## Create new working tree from a repository (git 2.5) ```sh git worktree add -b ``` ## Create new working tree from HEAD state ```sh git worktree add --detach HEAD ``` ## Untrack files without deleting ```sh git rm --cached ``` __Alternatives:__ ```sh git rm --cached -r ``` ## Before deleting untracked files/directory, do a dry run to get the list of these files/directories ```sh git clean -n ``` ## Forcefully remove untracked files ```sh git clean -f ``` ## Forcefully remove untracked directory ```sh git clean -f -d ``` __Alternatives:__ ```sh git clean -df ``` ## Update all the submodules ```sh git submodule foreach git pull ``` __Alternatives:__ ```sh git submodule update --init --recursive ``` ## Show all commits in the current branch yet to be merged to master ```sh git cherry -v master ``` __Alternatives:__ ```sh git cherry -v master ``` ## Rename a branch ```sh git branch -m ``` __Alternatives:__ ```sh git branch -m [] ``` ## rebases 'feature' to 'master' and merges it in to master ```sh git checkout feature && git rebase @{-1} && git checkout @{-2} && git merge @{-1} ``` ## Archive the `master` branch ```sh git archive master --format=zip --output=master.zip ``` ## Modify previous commit without modifying the commit message ```sh git add --all && git commit --amend --no-edit ``` ## Prunes references to remote 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 ``` ## Visualize the version tree. ```sh git log --pretty=oneline --graph --decorate --all ``` __Alternatives:__ ```sh gitk --all ``` ## Deploying git tracked subfolder to gh-pages ```sh git subtree push --prefix subfolder_name origin gh-pages ``` ## Adding a project to repo using subtree ```sh git subtree add --prefix=/ --squash git@github.com:/.git master ``` ## Get latest changes in your repo for a linked project using subtree ```sh git subtree pull --prefix=/ --squash git@github.com:/.git master ``` ## Export a branch with history to a file. ```sh git bundle create ``` ## Import from a bundle ```sh git clone repo.bundle -b ``` ## Get the name of current branch. ```sh git rev-parse --abbrev-ref HEAD ``` ## 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 ``` ## Stash changes before rebasing ```sh git rebase --autostash ``` ## Fetch pull request by ID to a local branch ```sh git fetch origin pull//head: ``` __Alternatives:__ ```sh git pull origin pull//head: ``` ## Show the most recent tag on the current branch. ```sh git describe --tags --abbrev=0 ``` ## Show inline word diff. ```sh git diff --word-diff ``` ## Don’t consider changes for tracked file. ```sh git update-index --assume-unchanged ``` ## Undo assume-unchanged. ```sh git update-index --no-assume-unchanged ``` ## Clean the files from `.gitignore`. ```sh git clean -X -f ``` ## Restore deleted file. ```sh git checkout ^ -- ``` ## Restore file to a specific commit-hash ```sh git checkout -- ``` ## Always rebase instead of merge on pull. ```sh git config --global branch.autosetuprebase always ``` ## List all the alias and configs. ```sh git config --list ``` ## Make git case sensitive. ```sh git config --global core.ignorecase false ``` ## Auto correct typos. ```sh git config --global help.autocorrect 1 ``` ## Check if the change was a part of a release. ```sh git name-rev --name-only ``` ## Dry run. (any command that supports dry-run flag should do.) ```sh git clean -fd --dry-run ``` ## Marks your commit as a fix of a previous commit. ```sh git commit --fixup ``` ## squash fixup commits normal commits. ```sh git rebase -i --autosquash ``` ## skip staging area during commit. ```sh git commit -am ``` ## List ignored files. ```sh git check-ignore * ``` ## Status of ignored files. ```sh git status --ignored ``` ## Commits in Branch1 that are not in Branch2 ```sh git log Branch1 ^Branch2 ``` ## reuse recorded resolution, record and reuse previous conflicts resolutions. ```sh git config --global rerere.enabled 1 ``` ## Open all conflicted files in an editor. ```sh git diff --name-only | uniq | xargs $EDITOR ``` ## Count unpacked number of objects and their disk consumption. ```sh git count-objects --human-readable ``` ## Prune all unreachable objects from the object database. ```sh git gc --prune=now --aggressive ``` ## Instantly browse your working repository in gitweb. ```sh git instaweb [--local] [--httpd=] [--port=] [--browser=] ``` ## View the GPG signatures in the commit log ```sh git log --show-signature ``` ## Remove entry in the global config. ```sh git config --global --unset ``` ## Checkout a new branch without any history ```sh git checkout --orphan ``` ## File diff between staging and the last file version. ```sh git diff --staged ``` ## Extract file from another branch. ```sh git show : ``` ## List only the root and merge commits. ```sh git log --first-parent ``` ## Merge previous two commits into one. ```sh git rebase --interactive HEAD~2 ``` ## List all branch is WIP ```sh git checkout master && git branch --no-merged ``` ## 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 ``` ## List commits and changes to a specific file (even through renaming) ```sh git log --follow -p -- ``` ## Clone a single branch ```sh git clone -b --single-branch https://github.com/user/repo.git ``` ## Create and switch new branch ```sh git checkout -b ``` ## Ignore file mode changes on commits ```sh git config core.fileMode false ```