blocks|key|5482334|text|git+stash+pop+会在应用后丢弃(默认情况下是最顶层的)+stash，而git+stash+apply+会将其保留在stash列表中，以备以后重用(或者您可以对其执行git+stash+drop操作)。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|BOLD|entityRanges|data|5482335|除非在git+stash+pop之后发生冲突，否则会发生这种情况，在这种情况下，它不会删除存储，而是让它的行为与git+stash+apply完全一样。|5482336|换个角度看：git+stash+pop就是git+stash+apply+&&+git+stash+drop。|5482337|entityMap^0|0|D|15|F|2G|E|E|7|1L|D|0|3|D|1K|F|0|6|D|L|X|0^^$0|@$1|2|3|4|5|6|7|M|8|@$9|N|A|O|B|C]|$9|P|A|Q|B|C]|$9|R|A|S|B|C]|$9|T|A|U|B|D]|$9|V|A|W|B|D]]|E|@]|F|$]]|$1|G|3|H|5|6|7|X|8|@$9|Y|A|Z|B|C]|$9|10|A|11|B|C]]|E|@]|F|$]]|$1|I|3|J|5|6|7|12|8|@$9|13|A|14|B|C]|$9|15|A|16|B|C]]|E|@]|F|$]]|$1|K|3|-4|5|6|7|17|8|@]|E|@]|F|$]]]|L|$]]

<code>git stash pop</code> throws away the (topmost, by default) stash after applying it, whereas <code>git stash apply</code> leaves it in the stash list for possible later reuse (or you can then <code>git stash drop</code> it). 

This happens unless there are conflicts after <code>git stash pop</code>, in which case it will not remove the stash, leaving it to behave exactly like <code>git stash apply</code>.

Another way to look at it: <code>git stash pop</code> is <code>git stash apply &amp;&amp; git stash drop</code>.

blocks|key|5482372|text|正如John+Zwinck所说，获得了这个有用的链接，它说明了不同之处，以及git+stash+pop的一个缺点。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|5482373|例如，|5482374|说您隐藏的更改与您自第一次创建存储以来所做的其他更改冲突。pop和apply都将有助于触发合并冲突解决模式，允许您很好地解决此类冲突…这两个都不会摆脱隐藏的东西，即使你可能也在期待流行音乐。由于许多人希望存储只是一个简单的堆栈，这通常会导致他们后来意外地弹出相同的存储，因为他们认为它已经消失了。|blockquote|5482375|5482376|5482377|链接：http://codingkilledthecat.wordpress.com/2012/04/27/git-stash-pop-considered-harmful/|5482378|entityMap|0|LINK|mutability|MUTABLE|url|http://codingkilledthecat.wordpress.com/2012/04/27/git-stash-pop-considered-harmful/^0|12|D|0|0|0|0|0|3|2C|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@$9|X|A|Y|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|Z|8|@]|D|@]|E|$]]|$1|H|3|I|5|J|7|10|8|@]|D|@]|E|$]]|$1|K|3|-4|5|6|7|11|8|@]|D|@]|E|$]]|$1|L|3|-4|5|6|7|12|8|@]|D|@]|E|$]]|$1|M|3|N|5|6|7|13|8|@]|D|@$9|14|A|15|1|16]]|E|$]]|$1|O|3|-4|5|6|7|17|8|@]|D|@]|E|$]]]|P|$Q|$5|R|S|T|E|$U|V]]]]

Got this helpful link that states the difference, as John Zwinck has stated and a drawback of <code>git stash pop</code>.

<blockquote>
 For instance, say your stashed changes conflict with other changes that you’ve made since you first created the stash. Both pop and apply will helpfully trigger merge conflict resolution mode, allowing you to nicely resolve such conflicts… and neither will get rid of the stash, even though perhaps you’re expecting pop too. Since a lot of people expect stashes to just be a simple stack, this often leads to them popping the same stash accidentally later because they thought it was gone.
</blockquote>

Link: <a href="http://codingkilledthecat.wordpress.com/2012/04/27/git-stash-pop-considered-harmful/" rel="noreferrer">http://codingkilledthecat.wordpress.com/2012/04/27/git-stash-pop-considered-harmful/</a>

blocks|key|827090|text|git+stash+pop应用顶部隐藏的元素并将其从堆栈中移除。git+stash+apply做了同样的事情，但是把它留在了stash堆栈中。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|827091|entityMap^0|0|D|W|F|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]|$9|K|A|L|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|M|8|@]|D|@]|E|$]]]|G|$]]

<code>git stash pop</code> applies the top stashed element and removes it from the stack. <code>git stash apply</code> does the same, but leaves it in the stash stack.

blocks|key|5482398|text|看到它的实际应用可能会帮助您更好地理解其中的区别。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|5482399|假设我们正在处理master分支，并且有一个包含"Hello“字符串的文件hello.txt。|offset|length|style|CODE|5482400|让我们修改文件并添加“world”字符串到其中。现在，您希望移动到另一个分支来修复您刚刚发现的一个小bug，因此您需要对您的更改执行stash操作：|5482401|git+stash|code-block|syntax|javascript|5482402|您移动到另一个分支，修复了错误，现在可以继续处理您的master分支，因此您需要pop更改：|5482403|git+stash+pop|5482404|现在，如果您尝试查看隐藏内容，您将得到：|5482405|$+git+stash+show+-p
No+stash+found.|5482406|但是，如果您使用git+stash+apply，您将获得隐藏的内容，但您也会保留它：|5482407|$+git+stash+show+-p
diff+--git+a/hello.txt+b/hello.txt
index+e965047..802992c+100644
---+a/hello.txt
%2B%2B%2B+b/hello.txt
@@+-1+%2B1+@@
-Hello
%2BHello+world|5482408|所以pop就像stack的弹出窗口--一旦元素弹出，它就会删除元素，而apply更像是peek。|5482409|entityMap^0|0|8|6|11|9|0|1U|5|0|0|Q|6|14|3|0|0|0|0|8|F|0|0|2|3|Z|5|0^^$0|@$1|2|3|4|5|6|7|14|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|15|8|@$D|16|E|17|F|G]|$D|18|E|19|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|1A|8|@$D|1B|E|1C|F|G]]|9|@]|A|$]]|$1|J|3|K|5|L|7|1D|8|@]|9|@]|A|$M|N]]|$1|O|3|P|5|6|7|1E|8|@$D|1F|E|1G|F|G]|$D|1H|E|1I|F|G]]|9|@]|A|$]]|$1|Q|3|R|5|L|7|1J|8|@]|9|@]|A|$M|N]]|$1|S|3|T|5|6|7|1K|8|@]|9|@]|A|$]]|$1|U|3|V|5|L|7|1L|8|@]|9|@]|A|$M|N]]|$1|W|3|X|5|6|7|1M|8|@$D|1N|E|1O|F|G]]|9|@]|A|$]]|$1|Y|3|Z|5|L|7|1P|8|@]|9|@]|A|$M|N]]|$1|10|3|11|5|6|7|1Q|8|@$D|1R|E|1S|F|G]|$D|1T|E|1U|F|G]]|9|@]|A|$]]|$1|12|3|-4|5|6|7|1V|8|@]|9|@]|A|$]]]|13|$]]

Seeing it in action might help you better understanding the difference.

Assuming we're working on <code>master</code> branch and have a file <code>hello.txt</code> that contains "Hello" string.

Let's modify the file and add " world" string to it. Now you want to move to a different branch to fix a minor bug you've just found, so you need to <code>stash</code> your changes:

<pre><code>git stash
</code></pre>

You moved to the other branch, fixed the bug and now you're ready to continue working on your <code>master</code> branch, so you <code>pop</code> the changes:

<pre><code>git stash pop
</code></pre>

Now if you try to review the stash content you'll get:

<pre><code>$ git stash show -p
No stash found.
</code></pre>

However, if you use <code>git stash apply</code> instead, you'll get the stashed content but you'll also keep it:

<pre><code>$ git stash show -p
diff --git a/hello.txt b/hello.txt
index e965047..802992c 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1 +1 @@
-Hello
+Hello world
</code></pre>

So <code>pop</code> is just like stack's pop - it actually removes the element once it's popped, while <code>apply</code> is more like peek.

blocks|key|5482627|text|假设不会抛出错误，并且您希望处理可用存储列表中的顶级存储项：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|5482628|git+stash+pop+=+git+stash+apply+%2B+git+stash+drop|offset|length|style|CODE|5482629|entityMap^0|0|0|D|G|F|Y|E|0^^$0|@$1|2|3|4|5|6|7|J|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|K|8|@$D|L|E|M|F|G]|$D|N|E|O|F|G]|$D|P|E|Q|F|G]]|9|@]|A|$]]|$1|H|3|-4|5|6|7|R|8|@]|9|@]|A|$]]]|I|$]]

Assuming there will be no errors thrown, and you want to work on the top stash item in the list of available stashes:
<code>git stash pop</code> = <code>git stash apply</code> + <code>git stash drop</code>

blocks|key|830186|text|在git+中，stash是一个存储区域，可以在其中移动当前更改的文件。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|BOLD|entityRanges|data|830187|当您想要从git存储库中提取一些更改并检测到git存储库中可用的一些共同文件中的一些更改时，stash区域非常有用。|830188|git+stash+apply+//apply+the+changes+without+removing+stored+files+from+stash+area.

git+stash+pop++//+apply+the+changes+as+well+as+remove+stored+files+from+stash+area.|code-block|syntax|javascript|830189|830190|注意:-+git+apply仅在git+pop应用以及从stash区域中删除更改时应用来自存储区的更改。|blockquote|830191|830192|entityMap^0|1|3|5|7|0|5|3|M|3|1A|5|0|0|0|5|9|G|7|S|5|0|0^^$0|@$1|2|3|4|5|6|7|U|8|@$9|V|A|W|B|C]|$9|X|A|Y|B|D]]|E|@]|F|$]]|$1|G|3|H|5|6|7|Z|8|@$9|10|A|11|B|C]|$9|12|A|13|B|C]|$9|14|A|15|B|C]]|E|@]|F|$]]|$1|I|3|J|5|K|7|16|8|@]|E|@]|F|$L|M]]|$1|N|3|-4|5|6|7|17|8|@]|E|@]|F|$]]|$1|O|3|P|5|Q|7|18|8|@$9|19|A|1A|B|C]|$9|1B|A|1C|B|C]|$9|1D|A|1E|B|C]]|E|@]|F|$]]|$1|R|3|-4|5|6|7|1F|8|@]|E|@]|F|$]]|$1|S|3|-4|5|6|7|1G|8|@]|E|@]|F|$]]]|T|$]]

In <code>git</code> stash is a storage area where current changed files can be moved. 

<code>stash</code> area is useful when you want to pull some changes from <code>git</code> repository and detected some changes in some mutual files available in <code>git</code> repo.

<pre><code>git stash apply //apply the changes without removing stored files from stash area.

git stash pop // apply the changes as well as remove stored files from stash area.
</code></pre>

<blockquote>
 Note :- <code>git apply</code> only apply the changes from stash area while <code>git pop</code> apply as well as remove change from <code>stash</code> area.
</blockquote>

blocks|key|2130654|text|快速回答：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2130655|从隐藏列表中删除git+stash+pop+->|offset|length|style|CODE|2130656|git+stash+apply+->将其保存在隐藏列表中|2130657|entityMap^0|0|8|D|0|0|F|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|M|8|@$D|N|E|O|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|P|8|@$D|Q|E|R|F|G]]|9|@]|A|$]]|$1|J|3|-4|5|6|7|S|8|@]|9|@]|A|$]]]|K|$]]

Quick Answer:
<code>git stash pop</code> -&gt; remove from the stash list
<code>git stash apply</code> -&gt; keep it in the stash list

blocks|key|5482476|text|Git+Stash+Pop+vs+apply+Working|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|CODE|entityRanges|data|5482477|如果您想要将顶级存储的更改应用于当前的非暂存更改，并同时删除该存储，那么您应该使用git+stash+pop。|5482478|#+apply+the+top+stashed+changes+and+delete+it+from+git+stash+area.
git+stash+pop++|code-block|syntax|javascript|5482479|但是，如果您希望将顶级存储更改应用于当前未暂存的更改，而不删除它，那么您应该使用git+stash+apply。|5482480|5482481|注意:您可以将这种情况与Stack类pop()和peek()方法联系起来，在这些方法中，pop通过递减(top+=+top-1)更改顶部，但peek()只能获取顶部元素。|blockquote|5482482|5482483|entityMap^0|0|9|A|C|N|7|A|C|0|15|D|0|0|14|F|0|0|C|5|I|5|O|6|1Y|6|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@$9|X|A|Y|B|C]|$9|Z|A|10|B|C]|$9|11|A|12|B|C]|$9|13|A|14|B|D]]|E|@]|F|$]]|$1|G|3|H|5|6|7|15|8|@$9|16|A|17|B|D]]|E|@]|F|$]]|$1|I|3|J|5|K|7|18|8|@]|E|@]|F|$L|M]]|$1|N|3|O|5|6|7|19|8|@$9|1A|A|1B|B|D]]|E|@]|F|$]]|$1|P|3|-4|5|6|7|1C|8|@]|E|@]|F|$]]|$1|Q|3|R|5|S|7|1D|8|@$9|1E|A|1F|B|D]|$9|1G|A|1H|B|D]|$9|1I|A|1J|B|D]|$9|1K|A|1L|B|D]]|E|@]|F|$]]|$1|T|3|-4|5|6|7|1M|8|@]|E|@]|F|$]]|$1|U|3|-4|5|6|7|1N|8|@]|E|@]|F|$]]]|V|$]]

Git Stash <code>Pop vs apply</code> Working

If you want to apply your top stashed changes to current non-staged change and delete that stash as well, then you should go for <code>git stash pop</code>.

<pre><code># apply the top stashed changes and delete it from git stash area.
git stash pop 
</code></pre>

But if you are want to apply your top stashed changes to current non-staged change without deleting it, then you should go for <code>git stash apply</code>.

<blockquote>
 Note : You can relate this case with <code>Stack</code> class <code>pop()</code> and <code>peek()</code> methods, where pop change the top by decrements (top = top-1) but <code>peek()</code> only able to get the top element.
</blockquote>

I've been using <code>git stash pop</code> for quite some time. I recently found out about the <code>git stash apply</code> command. When I tried it out, it seemed to work the same as <code>git stash pop</code>. 

What is the difference between <code>git stash pop</code> and <code>git stash apply</code>?

Difference between git stash pop and git stash apply

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

我使用git stash pop已经有一段时间了。我最近发现了git stash apply命令。当我试用它的时候，它的工作原理似乎和git stash pop一样。git stash pop和git stash apply之间的区别是什么

问git stash pop和git stash apply之间的区别
EN

回答 8

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git stash pop和git stash apply之间的区别EN

回答 8

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git stash pop和git stash apply之间的区别
EN