diff --git a/README.md b/README.md index 7046962..5656cff 100644 --- a/README.md +++ b/README.md @@ -1,107 +1,109 @@ ## 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](https://github.com/git-tips/tips#everyday-git-in-twenty-commands-or-so) -* [Show helpful guides that come with Git](https://github.com/git-tips/tips#show-helpful-guides-that-come-with-git) -* [Overwrite pull](https://github.com/git-tips/tips#overwrite-pull) -* [List of all files till a commit](https://github.com/git-tips/tips#list-of-all-files-till-a-commit) -* [Git reset first commit](https://github.com/git-tips/tips#git-reset-first-commit) -* [List all the conflicted files](https://github.com/git-tips/tips#list-all-the-conflicted-files) -* [List of all files changed in a commit](https://github.com/git-tips/tips#list-of-all-files-changed-in-a-commit) -* [Unstaged changes since last commit](https://github.com/git-tips/tips#unstaged-changes-since-last-commit) -* [Changes staged for commit](https://github.com/git-tips/tips#changes-staged-for-commit) -* [Show both staged and unstaged changes](https://github.com/git-tips/tips#show-both-staged-and-unstaged-changes) -* [List all branches that are already merged into master](https://github.com/git-tips/tips#list-all-branches-that-are-already-merged-into-master) -* [Quickly switch to the previous branch](https://github.com/git-tips/tips#quickly-switch-to-the-previous-branch) -* [Remove branches that have already been merged with master](https://github.com/git-tips/tips#remove-branches-that-have-already-been-merged-with-master) -* [List all branches and their upstreams, as well as last commit on branch](https://github.com/git-tips/tips#list-all-branches-and-their-upstreams-as-well-as-last-commit-on-branch) -* [Track upstream branch](https://github.com/git-tips/tips#track-upstream-branch) -* [Delete local branch](https://github.com/git-tips/tips#delete-local-branch) -* [Delete remote branch](https://github.com/git-tips/tips#delete-remote-branch) -* [Undo local changes with the last content in head](https://github.com/git-tips/tips#undo-local-changes-with-the-last-content-in-head) -* [Revert: Undo a commit by creating a new commit](https://github.com/git-tips/tips#revert-undo-a-commit-by-creating-a-new-commit) -* [Reset: Discard commits, advised for private branch](https://github.com/git-tips/tips#reset-discard-commits-advised-for-private-branch) -* [Reword the previous commit message](https://github.com/git-tips/tips#reword-the-previous-commit-message) -* [Amend author.](https://github.com/git-tips/tips#amend-author) -* [Reset author, after author has been changed in the global config.](https://github.com/git-tips/tips#reset-author-after-author-has-been-changed-in-the-global-config) -* [Changing a remote's URL](https://github.com/git-tips/tips#changing-a-remotes-url) -* [Get list of all remote references](https://github.com/git-tips/tips#get-list-of-all-remote-references) -* [Get list of all local and remote branches](https://github.com/git-tips/tips#get-list-of-all-local-and-remote-branches) -* [Get only remote branches](https://github.com/git-tips/tips#get-only-remote-branches) -* [Stage parts of a changed file, instead of the entire file](https://github.com/git-tips/tips#stage-parts-of-a-changed-file-instead-of-the-entire-file) -* [Get git bash completion](https://github.com/git-tips/tips#get-git-bash-completion) -* [What changed since two weeks?](https://github.com/git-tips/tips#what-changed-since-two-weeks) -* [See all commits made since forking from master](https://github.com/git-tips/tips#see-all-commits-made-since-forking-from-master) -* [Pick commits across branches using cherry-pick](https://github.com/git-tips/tips#pick-commits-across-branches-using-cherry-pick) -* [Find out branches containing commit-hash](https://github.com/git-tips/tips#find-out-branches-containing-commit-hash) -* [Git Aliases](https://github.com/git-tips/tips#git-aliases) -* [Saving current state of tracked files without commiting](https://github.com/git-tips/tips#saving-current-state-of-tracked-files-without-commiting) -* [Saving current state including untracked files](https://github.com/git-tips/tips#saving-current-state-including-untracked-files) -* [Show list of all saved stashes](https://github.com/git-tips/tips#show-list-of-all-saved-stashes) -* [Apply any stash without deleting from the stashed list](https://github.com/git-tips/tips#apply-any-stash-without-deleting-from-the-stashed-list) -* [Apply last stashed state and delete it from stashed list](https://github.com/git-tips/tips#apply-last-stashed-state-and-delete-it-from-stashed-list) -* [Delete all stored stashes](https://github.com/git-tips/tips#delete-all-stored-stashes) -* [Grab a single file from a stash](https://github.com/git-tips/tips#grab-a-single-file-from-a-stash) -* [Show all tracked files](https://github.com/git-tips/tips#show-all-tracked-files) -* [Show all untracked files](https://github.com/git-tips/tips#show-all-untracked-files) -* [Show all ignored files](https://github.com/git-tips/tips#show-all-ignored-files) -* [Create new working tree from a repository (git 2.5)](https://github.com/git-tips/tips#create-new-working-tree-from-a-repository-git-25) -* [Create new working tree from HEAD state](https://github.com/git-tips/tips#create-new-working-tree-from-head-state) -* [Untrack files without deleting](https://github.com/git-tips/tips#untrack-files-without-deleting) -* [Before deleting untracked files/directory, do a dry run to get the list of these files/directories](https://github.com/git-tips/tips#before-deleting-untracked-filesdirectory-do-a-dry-run-to-get-the-list-of-these-filesdirectories) -* [Forcefully remove untracked files](https://github.com/git-tips/tips#forcefully-remove-untracked-files) -* [Forcefully remove untracked directory](https://github.com/git-tips/tips#forcefully-remove-untracked-directory) -* [Update all the submodules](https://github.com/git-tips/tips#update-all-the-submodules) -* [Show all commits in the current branch yet to be merged to master](https://github.com/git-tips/tips#show-all-commits-in-the-current-branch-yet-to-be-merged-to-master) -* [Rename a branch](https://github.com/git-tips/tips#rename-a-branch) -* [rebases 'feature' to 'master' and merges it in to master ](https://github.com/git-tips/tips#rebases-feature-to-master-and-merges-it-in-to-master) -* [Archive the `master` branch](https://github.com/git-tips/tips#archive-the-master-branch) -* [Modify previous commit without modifying the commit message](https://github.com/git-tips/tips#modify-previous-commit-without-modifying-the-commit-message) -* [Prunes branches that have been deleted in the remote.](https://github.com/git-tips/tips#prunes-branches-that-have-been-deleted-in-the-remote) -* [Retrieve the commit hash of the initial revision.](https://github.com/git-tips/tips#retrieve-the-commit-hash-of-the-initial-revision) -* [Visualize the version tree.](https://github.com/git-tips/tips#visualize-the-version-tree) -* [Deploying git tracked subfolder to gh-pages](https://github.com/git-tips/tips#deploying-git-tracked-subfolder-to-gh-pages) -* [Adding a project to repo using subtree](https://github.com/git-tips/tips#adding-a-project-to-repo-using-subtree) -* [Get latest changes in your repo for a linked project using subtree](https://github.com/git-tips/tips#get-latest-changes-in-your-repo-for-a-linked-project-using-subtree) -* [Export a branch with history to the a file.](https://github.com/git-tips/tips#export-a-branch-with-history-to-the-a-file) -* [Import from a bundle](https://github.com/git-tips/tips#import-from-a-bundle) -* [Get the name of current branch.](https://github.com/git-tips/tips#get-the-name-of-current-branch) -* [Ignore one file on commit (e.g. Changelog).](https://github.com/git-tips/tips#ignore-one-file-on-commit-eg-changelog) -* [Stash changes before rebasing](https://github.com/git-tips/tips#stash-changes-before-rebasing) -* [Fetch pull request by ID to a local branch](https://github.com/git-tips/tips#fetch-pull-request-by-id-to-a-local-branch) -* [Show the most recent tag on the current branch.](https://github.com/git-tips/tips#show-the-most-recent-tag-on-the-current-branch) -* [Show inline word diff.](https://github.com/git-tips/tips#show-inline-word-diff) -* [Don’t consider changes for tracked file.](https://github.com/git-tips/tips#dont-consider-changes-for-tracked-file) -* [Undo assume-unchanged.](https://github.com/git-tips/tips#undo-assume-unchanged) -* [Clean the files from `.gitignore`.](https://github.com/git-tips/tips#clean-the-files-from-gitignore) -* [Restore deleted file.](https://github.com/git-tips/tips#restore-deleted-file) -* [Restore file to a specific commit-hash](https://github.com/git-tips/tips#restore-file-to-a-specific-commit-hash) -* [Always rebase instead of merge on pull.](https://github.com/git-tips/tips#always-rebase-instead-of-merge-on-pull) -* [List all the alias and configs.](https://github.com/git-tips/tips#list-all-the-alias-and-configs) -* [Make git case sensitive.](https://github.com/git-tips/tips#make-git-case-sensitive) -* [Auto correct typos.](https://github.com/git-tips/tips#auto-correct-typos) -* [Check if the change was a part of a release.](https://github.com/git-tips/tips#check-if-the-change-was-a-part-of-a-release) -* [Dry run. (any command that supports dry-run flag should do.)](https://github.com/git-tips/tips#dry-run-any-command-that-supports-dry-run-flag-should-do) -* [Marks your commit as a fix of a previous commit.](https://github.com/git-tips/tips#marks-your-commit-as-a-fix-of-a-previous-commit) -* [squash fixup commits normal commits.](https://github.com/git-tips/tips#squash-fixup-commits-normal-commits) -* [skip staging area during commit.](https://github.com/git-tips/tips#skip-staging-area-during-commit) -* [List ignored files.](https://github.com/git-tips/tips#list-ignored-files) -* [Status of ignored files.](https://github.com/git-tips/tips#status-of-ignored-files) -* [Commits in Branch1 that are not in Branch2](https://github.com/git-tips/tips#commits-in-branch1-that-are-not-in-branch2) -* [reuse recorded resolution, record and reuse previous conflicts resolutions.](https://github.com/git-tips/tips#reuse-recorded-resolution-record-and-reuse-previous-conflicts-resolutions) -* [Open all conflicted files in an editor.](https://github.com/git-tips/tips#open-all-conflicted-files-in-an-editor) -* [Count unpacked number of objects and their disk consumption.](https://github.com/git-tips/tips#count-unpacked-number-of-objects-and-their-disk-consumption) -* [Prune all unreachable objects from the object database.](https://github.com/git-tips/tips#prune-all-unreachable-objects-from-the-object-database) -* [Instantly browse your working repository in gitweb.](https://github.com/git-tips/tips#instantly-browse-your-working-repository-in-gitweb) -* [View the GPG signatures in the commit log](https://github.com/git-tips/tips#view-the-gpg-signatures-in-the-commit-log) -* [Remove entry in the global config.](https://github.com/git-tips/tips#remove-entry-in-the-global-config) -* [Checkout a new branch without any history](https://github.com/git-tips/tips#checkout-a-new-branch-without-any-history) -* [File diff between staging and the last file version.](https://github.com/git-tips/tips#file-diff-between-staging-and-the-last-file-version) -* [Extract file from another branch.](https://github.com/git-tips/tips#extract-file-from-another-branch) -* [List only the root and merge commits.](https://github.com/git-tips/tips#list-only-the-root-and-merge-commits) -* [Merge previous two commits into one.](https://github.com/git-tips/tips#merge-previous-two-commits-into-one) +* [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 the a file.](#export-a-branch-with-history-to-the-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) @@ -462,7 +464,7 @@ git archive master --format=zip --output=master.zip git add --all && git commit --amend --no-edit ``` -## Prunes branches that have been deleted in the remote. +## Prunes references to remote branches that have been deleted in the remote. ```sh git fetch -p ```