[ { "title": "Overwrite pull", "tip": "git fetch --all && git reset --hard origin/master" }, { "title": "List of all files till a commit", "tip": "git ls-tree --name-only -r " }, { "title": "Git reset first commit", "tip": "git update-ref -d HEAD" }, { "title": "List all the conflicted files", "tip": "git diff --name-only --diff-filter=U" }, { "title": "List of all files changed in a commit", "tip": "git diff-tree --no-commit-id --name-only -r " }, { "title":"Unstaged changes since last commit", "tip":"git diff" }, { "title":"Changes staged for commit", "tip":"git diff --cached" }, { "title":"Show both staged and unstaged changes", "tip":"git diff HEAD" }, { "title": "List all branches that are already merged into master", "tip": "git checkout master && git branch --merged" }, { "title": "Quickly switch to the previous branch", "tip": "git checkout -" }, { "title": "Remove branches that have already been merged with master", "tip": "git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d" }, { "title": "List all branches and their upstreams, as well as last commit on branch", "tip": "git branch -vv" }, { "title": "Track upstream branch", "tip": "git branch -u origin/mybranch" }, { "title": "Delete local branch", "tip": "git branch -d " }, { "title": "Delete remote branch", "tip": "git push origin --delete ", "alternatives": ["git push origin :"] }, { "title": "Undo local changes with the last content in head", "tip": "git checkout -- " }, { "title":"Revert: Undo a commit by creating a new commit", "tip":"git revert " }, { "title":"Reset: Discard commits, advised for private branch", "tip":"git reset " }, { "title": "Reword the previous commit message", "tip": "git commit -v --amend" }, { "title": "Changing a remote's URL", "tip": "git remote set-url origin " }, { "title": "Get list of all remote references", "tip": "git remote", "alternatives": ["git remote show"] }, { "title": "Get list of all local and remote branches", "tip": "git branch -a" }, { "title": "Get only remote branches", "tip": "git branch -r" }, { "title": "Stage parts of a changed file, instead of the entire file", "tip": "git add -p" }, { "title": "Get git bash completion", "tip": "curl http://git.io/vfhol > ~/.git-completion.bash && echo '[ -f ~/.git-completion.bash ] && . ~/.git-completion.bash' >> ~/.bashrc" }, { "title": "What changed since two weeks?", "tip": "git whatchanged --since='2 weeks ago'" }, { "title": "See all commits made since forking from master", "tip": "git log --no-merges --stat --reverse master.." }, { "title": "Pick commits across branches using cherry-pick", "tip": "git checkout && cherry-pick " }, { "title": "Find out branches containing commit-hash", "tip": "git branch -a --contains ", "alternatives": ["git branch --contains "] }, { "title": "Git Aliases", "tip": "git config --global alias. \ngit config --global alias.st status" }, { "title":"Saving current state of tracked files without commiting", "tip": "git stash", "alternatives": ["git stash save"] }, { "title":"Saving current state including untracked files", "tip": "git stash save -u", "alternatives": ["git stash save --include-untracked"] }, { "title":"Show list of all saved stashes", "tip": "git stash list" }, { "title": "Apply any stash without deleting from the stashed list", "tip": "git stash apply " }, { "title":"Apply last stashed state and delete it from stashed list", "tip": "git stash pop", "alternatives": ["git stash apply stash@{0} && git stash drop stash@{0}"] }, { "title": "Delete all stored stashes", "tip": "git stash clear", "alternatives": ["git stash drop "] }, { "title":"Show all tracked files", "tip":"git ls-files -t" }, { "title":"Show all untracked files", "tip":"git ls-files --others" }, { "title": "Show all ignored files", "tip": "git ls-files --others -i --exclude-standard" }, { "title": "Create new working tree from a repository (git 2.5)", "tip":"git worktree add -b " }, { "title": "Create new working tree from HEAD state", "tip": "git worktree add --detach HEAD" }, { "title": "Before deleting untracked files/directory, do a dry run to get the list of these files/directories", "tip": "git clean -n" }, { "title": "Forcefully remove untracked files", "tip": "git clean -f" }, { "title": "Forcefully remove untracked directory", "tip": "git clean -f -d", "alternatives": ["git clean -df"] }, { "title": "Update all the submodules", "tip": "git submodule foreach git pull" }, { "title": "Show all commits in the current branch yet to be merged to master", "tip": "git cherry -v master", "alternatives": ["git cherry -v master "] }, { "title": "Rename a branch", "tip": "git branch -m ", "alternatives": ["git branch -m [] "] }, { "title": "rebases 'feature' to 'master' and merges it in to master ", "tip": "git checkout feature && git rebase @{-1} && git checkout @{-2} && git merge @{-1}" }, { "title": "Archive the `master` branch", "tip": "git archive master --format=zip --output=master.zip" }, { "title": "Modify previous commit without modifying the commit message", "tip": "git add --all && git commit --amend --no-edit" }, { "title": "Purnes branches that have been deleted in the remote.", "tip": "git fetch -p", "alternatives":["git remote prune origin"] }, { "title": "Retrieve the commit hash of the initial revision.", "tip": " git rev-list --reverse HEAD | head -1" }, { "title": "Visualize the version tree.", "tip": "git log --pretty=oneline --graph --decorate --all", "alternatives":["gitk --all"] }, { "title": "Deploying git tracked subfolder to gh-pages", "tip": "git subtree push --prefix subfolder_name origin gh-pages", "alternatives": "git subtree push --prefix subfolder_name origin branch_name" }, { "title": "Adding a project to repo using subtree", "tip": "git subtree add --prefix=/ --squash git@github.com:/.git master" }, { "title": "Get latest changes in your repo for a linked project using subtree", "tip": "git subtree pull --prefix=/ --squash git@github.com:/.git master" }, { "title": "Export a branch with history to the a file.", "tip": "git bundle create " }, { "title": "Import form a bundle", "tip": "git clone repo.bundle -b " }, { "title": "Get the name of current branch.", "tip": "git rev-parse --abbrev-ref HEAD" }, { "title": "Ignore one file on commit (e.g. Changelog).", "tip": "git update-index --assume-unchanged Changelog; git commit -a; git update-index --no-assume-unchanged Changelog" } ]