2015-07-15 13:17:39 +02:00
## git-tips
> Collection of `git-tips`, want to add your tips? Checkout [contributing.md](./contributing.md)
2015-07-15 13:01:27 +02:00
<!-- @doxie .inject start toc -->
<!-- Don’ t remove or change the comment above – that can break automatic updates. -->
2015-07-16 05:46:42 +02:00
* [Overwrite pull ](https://github.com/git-tips/tips#overwrite-pull )
2015-07-25 18:34:10 +02:00
* [List of all files changed in a commit ](https://github.com/git-tips/tips#list-of-all-files-changed-in-a-commit )
* [List of all files till a commit ](https://github.com/git-tips/tips#list-of-all-files-till-a-commit )
2015-07-16 05:46:42 +02:00
* [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 )
* [Delete local branch ](https://github.com/git-tips/tips#delete-local-branch )
* [Delete remote branch ](https://github.com/git-tips/tips#delete-remote-branch )
* [Undo local changes with the last content in head ](https://github.com/git-tips/tips#undo-local-changes-with-the-last-content-in-head )
* [Changing a remote's URL ](https://github.com/git-tips/tips#changing-a-remotes-url )
2015-07-17 08:57:32 +02:00
* [Get list of all remote references ](https://github.com/git-tips/tips#get-list-of-all-remote-references )
* [Get list of all local and remote branches ](https://github.com/git-tips/tips#get-list-of-all-local-and-remote-branches )
* [Get only remote branches ](https://github.com/git-tips/tips#get-only-remote-branches )
2015-07-16 08:59:32 +02:00
* [Stage parts of a changed file, instead of the entire file ](https://github.com/git-tips/tips#stage-parts-of-a-changed-file-instead-of-the-entire-file )
2015-07-17 03:21:14 +02:00
* [Get git bash completion ](https://github.com/git-tips/tips#get-git-bash-completion )
2015-07-22 09:56:24 +02:00
* [What changed since two weeks? ](https://github.com/git-tips/tips#what-changed-since-two-weeks )
2015-07-25 11:52:52 +02:00
* [Pick commits across branches using cherry-pick ](https://github.com/git-tips/tips#pick-commits-across-branches-using-cherry-pick )
2015-07-25 19:37:41 +02:00
* [Find out branches containing commit-hash ](https://github.com/git-tips/tips#find-out-branches-containing-commit-hash )
2015-07-27 06:03:30 +02:00
* [Git Aliases ](https://github.com/git-tips/tips#git-aliases )
2015-07-27 18:40:57 +02:00
* [Saving current state of tracked files without commiting ](https://github.com/git-tips/tips#saving-current-state-of-tracked-files-without-commiting )
* [Show list of all saved stashes ](https://github.com/git-tips/tips#show-list-of-all-saved-stashes )
* [Apply any stash without deleting from the stashed list ](https://github.com/git-tips/tips#apply-any-stash-without-deleting-from-the-stashed-list )
* [Apply last stashed state and delete it from stashed list ](https://github.com/git-tips/tips#apply-last-stashed-state-and-delete-it-from-stashed-list )
* [Delete all stored stashes ](https://github.com/git-tips/tips#delete-all-stored-stashes )
2015-07-15 13:01:27 +02:00
<!-- Don’ t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie .inject end toc -->
<!-- @doxie .inject start -->
<!-- Don’ t remove or change the comment above – that can break automatic updates. -->
2015-07-15 12:25:24 +02:00
## Overwrite pull
2015-07-15 09:26:27 +02:00
```sh
2015-07-15 13:01:27 +02:00
git fetch --all & & git reset --hard origin/master
2015-07-15 09:26:27 +02:00
```
2015-07-25 18:34:10 +02:00
## List of all files changed in a commit
```sh
git diff-tree --no-commit-id --name-only -r < commit-ish >
```
## List of all files till a commit
2015-07-15 09:26:27 +02:00
```sh
git ls-tree --name-only -r < commit-ish >
```
2015-07-15 12:25:24 +02:00
## Git reset first commit
2015-07-15 09:26:27 +02:00
```sh
git update-ref -d HEAD
```
2015-07-15 12:25:24 +02:00
## List all the conflicted files
2015-07-15 09:26:27 +02:00
```sh
git diff --name-only --diff-filter=U
```
2015-07-15 09:40:18 +02:00
2015-07-15 12:25:24 +02:00
## List all branches that are already merged into master
2015-07-15 09:35:57 +02:00
```sh
2015-07-15 13:01:27 +02:00
git checkout master & & git branch --merged
2015-07-15 09:35:57 +02:00
```
2015-07-15 12:25:24 +02:00
## Quickly switch to the previous branch
2015-07-15 09:35:57 +02:00
```sh
git checkout -
```
2015-07-15 13:01:27 +02:00
## Remove branches that have already been merged with master
2015-07-15 09:40:18 +02:00
```sh
2015-07-15 13:01:27 +02:00
git branch --merged | grep -v '\*' | xargs -n 1 git branch -d
2015-07-15 09:40:18 +02:00
```
2015-07-15 12:29:20 +02:00
2015-07-15 12:25:24 +02:00
## List all branches and their upstreams, as well as last commit on branch
2015-07-15 12:24:22 +02:00
```sh
git branch -vv
```
2015-07-15 09:35:57 +02:00
2015-07-15 12:25:24 +02:00
## Track upstream branch
2015-07-15 12:24:22 +02:00
```sh
git branch -u origin/mybranch
2015-07-15 12:29:20 +02:00
```
2015-07-15 13:01:27 +02:00
2015-07-15 16:37:46 +02:00
## Delete local branch
```sh
2015-07-16 05:37:15 +02:00
git branch -d < local_branchname >
2015-07-15 16:37:46 +02:00
```
## Delete remote branch
```sh
2015-07-16 05:37:15 +02:00
git push origin :< remote_branchname >
```
## Undo local changes with the last content in head
```sh
git checkout -- < file_name >
```
## Changing a remote's URL
```sh
git remote set-url origin < URL >
2015-07-15 16:37:46 +02:00
```
2015-07-17 08:57:32 +02:00
## Get list of all remote references
```sh
git remote
```
2015-07-17 09:31:25 +02:00
__Alternatives:__
```sh
git remote show
```
2015-07-17 08:57:32 +02:00
## Get list of all local and remote branches
```sh
git branch -a
```
## Get only remote branches
```sh
git branch -r
```
2015-07-16 08:59:32 +02:00
## Stage parts of a changed file, instead of the entire file
```sh
git add -p
```
2015-07-17 03:21:14 +02:00
## Get git bash completion
```sh
curl http://git.io/vfhol > ~/.git-completion.bash & & echo '[ -f ~/.git-completion.bash ] & & . ~/.git-completion.bash' >> ~/.bashrc
```
2015-07-22 09:56:24 +02:00
## What changed since two weeks?
```sh
git whatchanged --since='2 weeks ago'
```
2015-07-25 11:52:52 +02:00
## Pick commits across branches using cherry-pick
```sh
git checkout < branch-name > & & cherry-pick < commit-ish >
```
2015-07-25 19:37:41 +02:00
## Find out branches containing commit-hash
```sh
git branch -a --contains < commit-ish >
```
__Alternatives:__
```sh
git branch --contains < commit-ish >
```
2015-07-27 06:03:30 +02:00
## Git Aliases
```sh
git config --global alias.< handle > < command >
git config --global alias.st status
```
2015-07-27 18:40:57 +02:00
## Saving current state of tracked files without commiting
```sh
git stash
```
## Show list of all saved stashes
```sh
git stash list
```
## Apply any stash without deleting from the stashed list
```sh
git stash apply < stash @ { n } >
```
## Apply last stashed state and delete it from stashed list
```sh
git stash pop
```
__Alternatives:__
```sh
git stash apply stash@{0} & & git stash drop stash@{0}
```
## Delete all stored stashes
```sh
git stash clear
```
__Alternatives:__
```sh
git stash drop < stash @ { n } >
```
2015-07-15 13:01:27 +02:00
<!-- Don’ t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie .inject end -->