恢復Git中文件的選擇行

Question

我提交了添加了一些代碼並刪除了一些代碼的更改。現在，我想撤消這個。該文件還有其他更改（以及提交中更改的其他文件），我不想撤消該文件，因此標準的git恢復將不會執行。我想要的是創建一個提交，通過提供行號撤消這些選擇更改。最好是一種技術，允許我使用我的GUI客戶端（Github桌面）來選擇diff中的更改/行號。我會怎麼做呢？

Answer 1

可能有多種方式來實現這一點，但我喜歡的東西去：

# stage a reversion of the given commit without making a commit of this reversion 
git revert -n <hash-of-commit-to-partially revert> 

# Unstage these changes so the reversion is only in the working tree 
git reset 

# Selectively stage only the parts which make the reversions which you want 
git add -p <path-of-interest> 

# Optional: discard other changes from the working tree for testing 
# (you might need to "git clean" if you are discarding the reversion 
# of a change that originally removed a file) 
git checkout -- . 

# Commit the selective reversion 
git commit