是否可以对一行代码进行git-checkout而不是整个文件？

Question

如果我修改了几行版本化文件，是否可以通过命令行取消行的更改？

就像我会用整个文件做：

git checkout /path/to/file.extension 

但是做这样的事情，说

git checkout /path/to/file.extension --line 10 

这可能吗？

Answer 1

您可以使用git checkout -p单独查看每个大块，并决定是检查它们还是将它们保持原样（并且如果您想进一步缩小范围，也需要可选的路径参数）。

Answer 2

为了详细说明马特的回答，git checkout --patch -- <path argument>启动交互模式有以下选项：

y - stage this hunk 
n - do not stage this hunk 

q - quit; do not stage this hunk or any of the remaining ones 
a - stage this hunk and all later hunks in the file 
d - do not stage this hunk or any of the later hunks in the file 
g - select a hunk to go to 
/- search for a hunk matching the given regex 
j - leave this hunk undecided, see next undecided hunk 
J - leave this hunk undecided, see next hunk 
k - leave this hunk undecided, see previous undecided hunk 
K - leave this hunk undecided, see previous hunk 

s - split the current hunk into smaller hunks 
e - manually edit the current hunk 

? - print help 

的yns和e选项是一个良好的开端。

参见：

• https://git-scm.com/docs/git-checkout为--patch
• https://git-scm.com/docs/git-add的互动选择。