From e89eb24e670c6baf8d2c9944319323e5dc59bdd7 Mon Sep 17 00:00:00 2001 From: rednik96 Date: Sun, 3 May 2020 13:56:09 +0200 Subject: [PATCH 1/3] replacing `git stash save` by `git stash push` `git stash save` -> This option is deprecated in favour of git stash push. [git docs](https://git-scm.com/docs/git-stash#Documentation/git-stash.txt-save-p--patch-k--no-keep-index-u--include-untracked-a--all-q--quietltmessagegt) --- README.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0e69629..471ca71 100644 --- a/README.md +++ b/README.md @@ -442,7 +442,7 @@ git stash __Alternatives:__ ```sh -git stash save +git stash push ``` ## Saving current state of unstaged changes to tracked files @@ -458,7 +458,7 @@ git stash --keep-index ```sh -git stash save --keep-index +git stash push --keep-index ``` ## Saving current state including untracked files @@ -469,17 +469,23 @@ git stash -u __Alternatives:__ ```sh -git stash save -u +git stash push -u ``` ```sh -git stash save --include-untracked +git stash push --include-untracked ``` ## Saving current state with message ```sh -git stash save +git stash push -m +``` + + +__Alternatives:__ +```sh +git stash push --message ``` ## Saving current state of all files (ignored, untracked, and tracked) @@ -495,7 +501,7 @@ git stash --all ```sh -git stash save --all +git stash push --all ``` ## Show list of all saved stashes From 6b2007ab79b29cf21f7b52c34089f374a4c796b2 Mon Sep 17 00:00:00 2001 From: rednik96 Date: Sun, 10 Jan 2021 11:41:46 +0100 Subject: [PATCH 2/3] Revert "replacing `git stash save` by `git stash push`" This reverts commit e89eb24e670c6baf8d2c9944319323e5dc59bdd7. --- README.md | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 471ca71..0e69629 100644 --- a/README.md +++ b/README.md @@ -442,7 +442,7 @@ git stash __Alternatives:__ ```sh -git stash push +git stash save ``` ## Saving current state of unstaged changes to tracked files @@ -458,7 +458,7 @@ git stash --keep-index ```sh -git stash push --keep-index +git stash save --keep-index ``` ## Saving current state including untracked files @@ -469,23 +469,17 @@ git stash -u __Alternatives:__ ```sh -git stash push -u +git stash save -u ``` ```sh -git stash push --include-untracked +git stash save --include-untracked ``` ## Saving current state with message ```sh -git stash push -m -``` - - -__Alternatives:__ -```sh -git stash push --message +git stash save ``` ## Saving current state of all files (ignored, untracked, and tracked) @@ -501,7 +495,7 @@ git stash --all ```sh -git stash push --all +git stash save --all ``` ## Show list of all saved stashes From 0eb60008aad02c301fe8bf8bb9d268dd3cb18e0e Mon Sep 17 00:00:00 2001 From: rednik96 Date: Sun, 10 Jan 2021 11:46:57 +0100 Subject: [PATCH 3/3] replacing `git stash save` by `git stash push` --- tips.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tips.json b/tips.json index 3400539..9ad6945 100644 --- a/tips.json +++ b/tips.json @@ -131,22 +131,23 @@ }, { "title": "Saving current state of tracked files without commiting", "tip": "git stash", - "alternatives": ["git stash save"] + "alternatives": ["git stash push"] }, { "title": "Saving current state of unstaged changes to tracked files", "tip": "git stash -k", - "alternatives": ["git stash --keep-index", "git stash save --keep-index"] + "alternatives": ["git stash --keep-index", "git stash push --keep-index"] }, { "title": "Saving current state including untracked files", "tip": "git stash -u", - "alternatives": ["git stash save -u", "git stash save --include-untracked"] + "alternatives": ["git stash push -u", "git stash push --include-untracked"] }, { "title": "Saving current state with message", - "tip": "git stash save " + "tip": "git stash push -m ", + "alternatives": ["git stash push --message "] }, { "title": "Saving current state of all files (ignored, untracked, and tracked)", "tip": "git stash -a", - "alternatives": ["git stash --all", "git stash save --all"] + "alternatives": ["git stash --all", "git stash push --all"] }, { "title": "Show list of all saved stashes", "tip": "git stash list"