1
0
mirror of https://github.com/namibia/tips.git synced 2024-12-23 02:28:58 +00:00
Most commonly used git tips and tricks.
Go to file
2015-07-15 15:59:20 +05:30
README.md Fixed conflicts 2015-07-15 15:59:20 +05:30

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