git stash show -p | git apply --reverse

警告，这不会在所有情况下:“git apply -R”(man)不能正确处理两次触及同一路径的补丁，这已在git 2.30(2021年第一季度)中得到纠正。

这在将路径从常规文件更改为符号链接(反之亦然)的补丁中是最相关的。

参见Jonathan Tan (jhowtan)提交b0f266d(2020年10月20日)。 (由Junio C Hamano - gitster -在commit c23cd78中合并，2020年11月2日)

apply:当-R时，也是反向的section列表 协助:Junio C Hamano 署名:乔纳森·谭

A patch changing a symlink into a file is written with 2 sections (in the code, represented as "struct patch"): firstly, the deletion of the symlink, and secondly, the creation of the file. When applying that patch with -R, the sections are reversed, so we get: (1) creation of a symlink, then (2) deletion of a file. This causes an issue when the "deletion of a file" section is checked, because Git observes that the so-called file is not a file but a symlink, resulting in a "wrong type" error message. What we want is: (1) deletion of a file, then (2) creation of a symlink. In the code, this is reflected in the behavior of previous_patch() when invoked from check_preimage() when the deletion is checked. Creation then deletion means that when the deletion is checked, previous_patch() returns the creation section, triggering a mode conflict resulting in the "wrong type" error message. But deletion then creation means that when the deletion is checked, previous_patch() returns NULL, so the deletion mode is checked against lstat, which is what we want. There are also other ways a patch can contain 2 sections referencing the same file, for example, in 7a07841c0b ("git-apply: handle a patch that touches the same path more than once better", 2008-06-27, Git v1.6.0-rc0 -- merge). "git apply -R"(man) fails in the same way, and this commit makes this case succeed. Therefore, when building the list of sections, build them in reverse order (by adding to the front of the list instead of the back) when -R is passed.

V1 git手册页有一个关于取消应用存储的参考。节选如下。

更新的V2 git手册页不包括任何关于取消应用stash的参考，但下面的内容仍然可以很好地工作

取消应用Stash 在某些用例场景中，您可能希望应用存储的更改，做一些工作，但随后取消应用最初来自存储的那些更改。Git没有提供这样的stash unapply命令，但是可以通过简单地检索与stash相关的补丁并反向应用它来达到这个效果:

$ git stash show -p stash@{0} | git apply -R

同样，如果你没有指定一个存储，Git假设是最近的存储:

$ git stash show -p | git apply -R

您可能想要创建一个别名，并有效地向Git添加一个stash-unapply命令。例如:

$ git config --global alias.stash-unapply '!git stash show -p | git apply -R'
$ git stash apply
$ #... work work work
$ git stash-unapply

您可以应用两条命令

Git重置。//反转文件

then

Git结帐。//改变

你可以按照我分享的图像，以取消藏匿，如果你不小心点了藏匿。

这早就应该了，但如果我正确地解释这个问题，我已经找到了一个简单的解决方案，注意，这是我自己的术语解释:

Git stash [save]将保存当前的更改，并将当前分支设置为“清洁状态”

git的存储列表提供如下内容

Git应用stash@{0}将当前分支设置为之前的stash [save]

Git结帐。将当前分支设置为存储[保存]之后

保存在stash中的代码不会丢失，它可以通过git apply stash@{0}再次找到。

不管怎样，这对我很管用!

这是对上述答案的补充，但增加了基于消息的git存储的搜索，因为存储数可以在保存新存储时更改。 我写了几个bash函数:

apply(){
  if [ "$1" ]; then
    git stash apply `git stash list | grep -oPm1 "(.*)(?=:.*:.*$1.*)"`
  fi
}
remove(){
  if [ "$1" ]; then
    git stash show -p `git stash list | grep -oPm1 "(.*)(?=:.*:.*$1.*)"` | git apply -R
    git status
  fi
}

创建存储名称(消息)$ git存储保存为“我的存储” 命名为$ apply "my stash" 删除“my stash”