knowledge/git-tips
1
0
Fork 0
mirror of https://github.com/namibia/tips.git synced 2024-11-14 09:14:06 +00:00
Code Issues Releases Activity

Merge pull request #43 from samarpanda/single-file-from-stash

Browse Source 
Grab a file from stash / commit-hash!
This commit is contained in:
hemanth.hm 2016-02-13 10:15:23 +05:30
commit cf260b7ef4
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
README.md
View File

@ -43,11 +43,13 @@
* [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)
* [Grab a single file from a stash](https://github.com/git-tips/tips#grab-a-single-file-from-a-stash)
* [Show all tracked files](https://github.com/git-tips/tips#show-all-tracked-files)
* [Show all untracked files](https://github.com/git-tips/tips#show-all-untracked-files)
* [Show all ignored files](https://github.com/git-tips/tips#show-all-ignored-files)
* [Create new working tree from a repository (git 2.5)](https://github.com/git-tips/tips#create-new-working-tree-from-a-repository-git-25)
* [Create new working tree from HEAD state](https://github.com/git-tips/tips#create-new-working-tree-from-head-state)
* [Untrack files without deleting](https://github.com/git-tips/tips#untrack-files-without-deleting)
* [Before deleting untracked files/directory, do a dry run to get the list of these files/directories](https://github.com/git-tips/tips#before-deleting-untracked-filesdirectory-do-a-dry-run-to-get-the-list-of-these-filesdirectories)
* [Forcefully remove untracked files](https://github.com/git-tips/tips#forcefully-remove-untracked-files)
* [Forcefully remove untracked directory](https://github.com/git-tips/tips#forcefully-remove-untracked-directory)
@ -75,6 +77,7 @@
* [Undo assume-unchanged.](https://github.com/git-tips/tips#undo-assume-unchanged)
* [Clean the files from `.gitignore`.](https://github.com/git-tips/tips#clean-the-files-from-gitignore)
* [Restore deleted file.](https://github.com/git-tips/tips#restore-deleted-file)
* [Restore file to a specific commit-hash](https://github.com/git-tips/tips#restore-file-to-a-specific-commit-hash)
* [Always rebase instead of merge on pull.](https://github.com/git-tips/tips#always-rebase-instead-of-merge-on-pull)
* [List all the alias and configs.](https://github.com/git-tips/tips#list-all-the-alias-and-configs)
* [Make git case sensitive.](https://github.com/git-tips/tips#make-git-case-sensitive)
@ -331,6 +334,17 @@ __Alternatives:__
git stash drop <stash@{n}>
```
## Grab a single file from a stash
```sh
git checkout <stash@{n}> -- <file_path>
```
__Alternatives:__
```sh
git checkout stash@{0} -- <file_path>
```
## Show all tracked files
```sh
git ls-files -t
@ -356,6 +370,17 @@ git worktree add -b <branch-name> <path> <start-point>
git worktree add --detach <path> HEAD
```
## Untrack files without deleting
```sh
git rm --cached <file_path>
```
__Alternatives:__
```sh
git rm --cached -r <directory_path>
```
## Before deleting untracked files/directory, do a dry run to get the list of these files/directories
```sh
git clean -n
@ -527,6 +552,11 @@ git clean -X -f
git checkout <deleting_commit>^ -- <file_path>
```
## Restore file to a specific commit-hash
```sh
git checkout <commit-ish> -- <file_path>
```
## Always rebase instead of merge on pull.
```sh
git config --global branch.autosetuprebase always

11
tips.json
View File

@ -125,6 +125,10 @@
"title": "Delete all stored stashes",
"tip": "git stash clear",
"alternatives": ["git stash drop <stash@{n}>"]
}, {
"title": "Grab a single file from a stash",
"tip": "git checkout <stash@{n}> -- <file_path>",
"alternatives": ["git checkout stash@{0} -- <file_path>"]
}, {
"title": "Show all tracked files",
"tip": "git ls-files -t"
@ -140,6 +144,10 @@
}, {
"title": "Create new working tree from HEAD state",
"tip": "git worktree add --detach <path> HEAD"
}, {
"title": "Untrack files without deleting",
"tip": "git rm --cached <file_path>",
"alternatives": ["git rm --cached -r <directory_path>"]
}, {
"title": "Before deleting untracked files/directory, do a dry run to get the list of these files/directories",
"tip": "git clean -n"
@ -228,6 +236,9 @@
}, {
"title": "Restore deleted file.",
"tip": "git checkout <deleting_commit>^ -- <file_path>"
}, {
"title": "Restore file to a specific commit-hash",
"tip": "git checkout <commit-ish> -- <file_path>"
}, {
"title": "Always rebase instead of merge on pull.",
"tip": "git config --global branch.autosetuprebase always"