blocks|key|2077331|text|如果在较早的提交中只更改了此文件，并且希望撤消所有这些更改，则只需执行以下操作：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2077332|git+revert+SHA|code-block|syntax|javascript|2077333|如果有多个文件，这里有一个纯git+(但不是很好)的解决方案：|offset|length|style|CODE|2077334|git+revert+SHA+--no-commit
git+reset
git+add+path/to/file
git+checkout+.
git+commit|2077335|或者是git+%2B+patch解决方案(也不是很好)：|2077336|git+diff+-p+SHA+path/to/file+>+patch
patch+-R+<+patch
git+commit+.|2077337|entityMap^0|0|0|E|3|0|0|3|3|9|5|0|0^^$0|@$1|2|3|4|5|6|7|U|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|V|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|W|8|@$I|X|J|Y|K|L]]|9|@]|A|$]]|$1|M|3|N|5|D|7|Z|8|@]|9|@]|A|$E|F]]|$1|O|3|P|5|6|7|10|8|@$I|11|J|12|K|L]|$I|13|J|14|K|L]]|9|@]|A|$]]|$1|Q|3|R|5|D|7|15|8|@]|9|@]|A|$E|F]]|$1|S|3|-4|5|6|7|16|8|@]|9|@]|A|$]]]|T|$]]

If in the older commit you only changed this file, and you want to undo all those changes,
then simply do:

<pre><code>git revert SHA
</code></pre>

If there were more than one files, here's a pure <code>git</code> (and not great) solution:

<pre><code>git revert SHA --no-commit
git reset
git add path/to/file
git checkout .
git commit
</code></pre>

Or a <code>git</code> + <code>patch</code> solution (also not great):

<pre><code>git diff -p SHA path/to/file &gt; patch
patch -R &lt; patch
git commit .
</code></pre>

blocks|key|2077509|text|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2077510|以下是git-checkout语法：|offset|length|style|CODE|2077511|git+checkout+--patch+<tree-ish>+--+<paths>|code-block|syntax|javascript|2077512|或者，等同地，|2077513|git+checkout+-p+<tree-ish>+--+<paths>|2077514|允许您以交互方式从一个或多个文件中检出块，这些文件列在<paths>中，记录在<tree-ish>中(最常见的是提交)。|2077515|有关更多详细信息，请参阅git-checkout+man+page。|2077516|示例|2077517|2077518|#+set+things+up
$+mkdir+test
$+cd+test
$+git+init

#+create+some+content+and+commit
$+printf+"Hello,+world.\n"+>+README.md
$+printf+"foo\nbar\nbaz\n"+>+test.txt
$+git+add+.
$+git+commit+-m+"initial+commit"

#+modify+the+working+tree
$+printf+"another+line\n"+>>+README.md+
$+printf+"foo\nfoo\n"+>+test.txt

#+now+restore+stuff+from+test.txt+as+recorded+in+master's+tip
$+git+checkout+-p+master+--+test.txt
diff+--git+b/test.txt+a/test.txt
index+0d55bed..86e041d+100644
---+b/test.txt
%2B%2B%2B+a/test.txt
@@+-1,2+%2B1,3+@@
+foo
-foo
%2Bbar
%2Bbaz
Apply+this+hunk+to+index+and+worktree+[y,n,q,a,d,/,e,?]?+y
error:+patch+failed:+test.txt:1
error:+test.txt:+patch+does+not+apply
The+selected+hunks+do+not+apply+to+the+index!
Apply+them+to+the+worktree+anyway?+y

#+Sanity+check:+inspect+the+working+tree
#+(the+hunk+"bar\nbaz"+from+test.txt+was+restored,+as+desired)
$+cat+test.txt
foo
bar
baz
#+(README.md,+on+the+other+hand,+was+not+affected,+as+desired)
$+cat+README.md
Hello,+world.
another+line|2077519|entityMap|0|LINK|mutability|MUTABLE|url|https://www.kernel.org/pub/software/scm/git/docs/git-checkout.html^0|0|3|C|0|0|0|0|R|7|13|A|0|C|C|C|L|0|0|0|0|0^^$0|@$1|2|3|-4|4|5|6|16|7|@]|8|@]|9|$]]|$1|A|3|B|4|5|6|17|7|@$C|18|D|19|E|F]]|8|@]|9|$]]|$1|G|3|H|4|I|6|1A|7|@]|8|@]|9|$J|K]]|$1|L|3|M|4|5|6|1B|7|@]|8|@]|9|$]]|$1|N|3|O|4|I|6|1C|7|@]|8|@]|9|$J|K]]|$1|P|3|Q|4|5|6|1D|7|@$C|1E|D|1F|E|F]|$C|1G|D|1H|E|F]]|8|@]|9|$]]|$1|R|3|S|4|5|6|1I|7|@$C|1J|D|1K|E|F]]|8|@$C|1L|D|1M|1|1N]]|9|$]]|$1|T|3|U|4|5|6|1O|7|@]|8|@]|9|$]]|$1|V|3|-4|4|5|6|1P|7|@]|8|@]|9|$]]|$1|W|3|X|4|I|6|1Q|7|@]|8|@]|9|$J|K]]|$1|Y|3|-4|4|5|6|1R|7|@]|8|@]|9|$]]]|Z|$10|$4|11|12|13|9|$14|15]]]]

<h2>Use interactive checkout</h2>

The following <code>git-checkout</code> syntax,

<pre><code>git checkout --patch &lt;tree-ish&gt; -- &lt;paths&gt;
</code></pre>

or, equivalently,

<pre><code>git checkout -p &lt;tree-ish&gt; -- &lt;paths&gt;
</code></pre>

allows you to interactively check out hunks from one or more files, listed in <code>&lt;paths&gt;</code>, as recorded in <code>&lt;tree-ish&gt;</code> (most commonly, a commit).

See the <a href="https://www.kernel.org/pub/software/scm/git/docs/git-checkout.html" rel="nofollow"><code>git-checkout</code> man page</a> for more details.

<h2>Example</h2>

To fix ideas, here is a toy example (irrelevant stdout is omitted):

<pre class="lang-sh prettyprint-override"><code># set things up
$ mkdir test
$ cd test
$ git init

# create some content and commit
$ printf "Hello, world.\n" &gt; README.md
$ printf "foo\nbar\nbaz\n" &gt; test.txt
$ git add .
$ git commit -m "initial commit"

# modify the working tree
$ printf "another line\n" &gt;&gt; README.md 
$ printf "foo\nfoo\n" &gt; test.txt

# now restore stuff from test.txt as recorded in master's tip
$ git checkout -p master -- test.txt
diff --git b/test.txt a/test.txt
index 0d55bed..86e041d 100644
--- b/test.txt
+++ a/test.txt
@@ -1,2 +1,3 @@
 foo
-foo
+bar
+baz
Apply this hunk to index and worktree [y,n,q,a,d,/,e,?]? y
error: patch failed: test.txt:1
error: test.txt: patch does not apply
The selected hunks do not apply to the index!
Apply them to the worktree anyway? y

# Sanity check: inspect the working tree
# (the hunk "bar\nbaz" from test.txt was restored, as desired)
$ cat test.txt
foo
bar
baz
# (README.md, on the other hand, was not affected, as desired)
$ cat README.md
Hello, world.
another line
</code></pre>

I want to restore a few lines from a file recorded in an older commit. I can see those lines by running

<pre><code>git log -p
</code></pre>

As a last resort, I'm ready to simply copy those lines from the output of that log, but that would hurt my purist's heart and seems rather unprofessional.

I do not want to simply run <code>git checkout &lt;file&gt;</code> because that would discard local changes made to <code>&lt;file&gt;</code> since the commit in question. Instead, I would like to merge changes from that commit into <code>&lt;file&gt;</code> in the working tree using only pure Git commands.

How can I do that?

How can I restore only a few lines from a file recorded in a given commit?

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

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

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

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

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

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

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

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

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

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

我想从旧提交中记录的文件中恢复几行。我可以通过运行以下命令来查看这些行git log -p作为最后的手段，我准备简单地从该日志的输出中复制这些行，但这会伤害我的纯粹主义者的心，而且看起来相当不专业。我不想简单地运行git checkout <file>，因为这会丢弃自提交以来对<file>所做的本地更改。相反，我只想使...

问如何从记录在给定提交中的文件中仅恢复几行？
EN

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何从记录在给定提交中的文件中仅恢复几行？EN

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何从记录在给定提交中的文件中仅恢复几行？
EN