m-lamonaca/dev-notes
1
0
Fork 0
mirror of https://github.com/m-lamonaca/dev-notes.git synced 2025-04-05 18:36:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

git: add git restore --patch & git stash --keep-index notes

Browse source
This commit is contained in:
Marcello 2024-05-06 09:49:46 +02:00
parent 61db71e48a
commit 6ebf5f4f11
No known key found for this signature in database
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/misc/git.md
View file

@ -41,6 +41,7 @@ The applied config in each repository is the combination of all three scopes in
`git restore <file>`: discard uncommitted changes to file `git restore <file>`: discard uncommitted changes to file
`git restore --staged`: discard changes made to a file `git restore --staged`: discard changes made to a file
`git restore --staged --worktree`: unstage and discard changes made to a file `git restore --staged --worktree`: unstage and discard changes made to a file
`git restore -p|--patch`: interactively unstage chunks of files
`git commit`: save the snapshot to the project history `git commit`: save the snapshot to the project history
`git commit -m|--message "message"`: commit and provide a message `git commit -m|--message "message"`: commit and provide a message
@ -54,6 +55,7 @@ The applied config in each repository is the combination of all three scopes in
### Managing Stashes ### Managing Stashes
`git stash [push] [-m|--message]`: add all changes to the stash (and provide message) `git stash [push] [-m|--message]`: add all changes to the stash (and provide message)
`git stash [push] -k|--keep-index`: create a stash but leave files as they are
`git stash list` list all stashes `git stash list` list all stashes
`git stash show [<stash>]`: show changes in the stash `git stash show [<stash>]`: show changes in the stash
`git stash pop`: restore last stash `git stash pop`: restore last stash
@ -133,7 +135,7 @@ The applied config in each repository is the combination of all three scopes in
`git diff <filename>`: show difference since the last commit `git diff <filename>`: show difference since the last commit
`git diff <commit> <filename>`: show differences in a file since a particular snapshot `git diff <commit> <filename>`: show differences in a file since a particular snapshot
`git diff <reference_1> <reference_2> <filename>`: show differences in a file between two snapshots `git diff <reference_1> <reference_2> <filename>`: show differences in a file between two snapshots
`git diff --cached`: show what is about to be committed `git diff --staged`: show what is about to be committed
`git diff <first-branch>...<second-branch>`: show content diff between two branches `git diff <first-branch>...<second-branch>`: show content diff between two branches
`git diff -w|--ignore-all-space`: show diff ignoring whitespace differences `git diff -w|--ignore-all-space`: show diff ignoring whitespace differences
`git diff --word-diff`: show diff word-by-word instead of line-wise `git diff --word-diff`: show diff word-by-word instead of line-wise