From 6ebf5f4f119127f0d9a96b79f75295d81d41ac71 Mon Sep 17 00:00:00 2001 From: Marcello Lamonaca Date: Mon, 6 May 2024 09:49:46 +0200 Subject: [PATCH] git: add `git restore --patch` & `git stash --keep-index` notes --- docs/misc/git.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/misc/git.md b/docs/misc/git.md index b61a56f..d8e7ac2 100644 --- a/docs/misc/git.md +++ b/docs/misc/git.md @@ -41,6 +41,7 @@ The applied config in each repository is the combination of all three scopes in `git restore `: discard uncommitted changes to file `git restore --staged`: 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 -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 `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 show []`: show changes in the 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 `: show difference since the last commit `git diff `: show differences in a file since a particular snapshot `git diff `: 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 ...`: show content diff between two branches `git diff -w|--ignore-all-space`: show diff ignoring whitespace differences `git diff --word-diff`: show diff word-by-word instead of line-wise