mirror of
https://github.com/namibia/tips.git
synced 2024-12-22 18:18:58 +00:00
Most commonly used git tips and tricks.
.doxie.render.js | ||
.doxie.render.toc.js | ||
.gitignore | ||
contributing.md | ||
package.json | ||
README.md | ||
tips.json |
git-tips
Collection of
git-tips
, want to add your tips? Checkout contributing.md
- [Overwrite pull](https://github.com/git-tips/tips#Overwrite pull)
- [List of all the files changed in a commit](https://github.com/git-tips/tips#List of all the files changed in 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 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)
Overwrite pull
git fetch --all && git reset --hard origin/master
List of all the files changed in a commit
git ls-tree --name-only -r <commit-ish>
Git reset first commit
git update-ref -d HEAD
List all the conflicted files
git diff --name-only --diff-filter=U
List all branches that are already merged into master
git checkout master && git branch --merged
Quickly switch to the previous branch
git checkout -
Remove branches that have already been merged with master
git branch --merged | grep -v '\*' | xargs -n 1 git branch -d
List all branches and their upstreams, as well as last commit on branch
git branch -vv
Track upstream branch
git branch -u origin/mybranch