git-tips

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

• Overwrite pull
• List of all files changed in a commit
• List of all files till 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
• Undo local changes with the last content in head
• Changing a remote's URL
• Get list of all remote references
• Get list of all local and remote branches
• Get only remote branches
• Stage parts of a changed file, instead of the entire file
• Get git bash completion
• What changed since two weeks?
• Pick commits across branches using cherry-pick
• Find out branches containing commit-hash

Overwrite pull

git fetch --all && git reset --hard origin/master

List of all files changed in a commit

git diff-tree --no-commit-id --name-only -r <commit-ish>

List of all files till 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>

Undo local changes with the last content in head

git checkout -- <file_name>

Changing a remote's URL

git remote set-url origin <URL>

Get list of all remote references

git remote

Alternatives:

git remote show

Get list of all local and remote branches

git branch -a

Get only remote branches

git branch -r

Stage parts of a changed file, instead of the entire file

git add -p

Get git bash completion

curl http://git.io/vfhol > ~/.git-completion.bash && echo '[ -f ~/.git-completion.bash ] && . ~/.git-completion.bash' >> ~/.bashrc

What changed since two weeks?

git whatchanged --since='2 weeks ago'

Pick commits across branches using cherry-pick

git checkout <branch-name> && cherry-pick <commit-ish>

Find out branches containing commit-hash

git branch -a --contains <commit-ish>

Alternatives:

git branch --contains <commit-ish>