git-tips

Collection of git-tips, want to add your tips? Checkout contributing.md

• Overwrite pull
• List of all the files changed in a commit
• Git reset first commit
• List all the conflicted files
• List all branches that are already merged into master
• Quickly switch to the previous branch
• Remove branches that have already been merged with master
• List all branches and their upstreams, as well as last commit on branch
• Track upstream branch
• Delete local branch
• Delete remote 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

Delete local branch

git branch -d local_branchname

Delete remote branch

git push origin :remote_branchname