blocks|key|1025925|text|您可以使用git-revert+-n，然后使用add+--patch来选择块。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1025926|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

You can use git-revert -n, and then use add --patch to select hunks.

blocks|key|1025986|text|使用--no-commit+(-n)选项执行git+revert，然后取消转储更改，然后使用git+add+--patch|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1025987|$+git+revert+-n+$bad_commit++++#+Revert+the+commit,+but+don't+commit+the+changes
$+git+reset+HEAD+.+++++++++++++#+Unstage+the+changes
$+git+add+--patch+.++++++++++++#+Add+whatever+changes+you+want
$+git+commit+++++++++++++++++++#+Commit+those+changes|code-block|syntax|javascript|1025988|注意:使用git+add+--patch添加的文件是您想要还原的文件，而不是您想要保留的文件。|1025989|entityMap^0|2|B|F|2|M|A|1A|F|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@$9|P|A|Q|B|C]|$9|R|A|S|B|C]|$9|T|A|U|B|C]|$9|V|A|W|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|X|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|Y|8|@]|D|@]|E|$]]|$1|M|3|-4|5|6|7|Z|8|@]|D|@]|E|$]]]|N|$]]

Use the <code>--no-commit</code> (<code>-n</code>) option to <code>git revert</code>, then unstage the changes, then use <code>git add --patch</code>:

<pre><code>$ git revert -n $bad_commit # Revert the commit, but don't commit the changes
$ git reset HEAD . # Unstage the changes
$ git add --patch . # Add whatever changes you want
$ git commit # Commit those changes
</code></pre>

Note: The files you add using git add --patch are the files you want to revert, not the files you want to keep.

blocks|key|811290|text|我已经成功地使用了以下内容。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|811291|首先，还原完整的提交(将其放入索引中)，但不要提交。|811292|git+revert+-n+<sha1>++#+-n+is+short+for+--no-commit|code-block|syntax|javascript|811293|然后以交互方式从索引中删除恢复的良好更改|811294|git+reset+-p++++++++++#+-p+is+short+for+--patch++|811295|然后提交错误更改的反向比较|811296|git+commit+-m+"Partially+revert+<sha1>..."|811297|最后，恢复的良好更改(已被重置命令取消暂存)仍在工作树中。他们需要清理一下。如果工作树中没有其他未提交的更改，则可以通过|811298|git+reset+--hard|811299|entityMap^0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|X|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|Y|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|Z|8|@]|9|@]|A|$]]|$1|K|3|L|5|F|7|10|8|@]|9|@]|A|$G|H]]|$1|M|3|N|5|6|7|11|8|@]|9|@]|A|$]]|$1|O|3|P|5|F|7|12|8|@]|9|@]|A|$G|H]]|$1|Q|3|R|5|6|7|13|8|@]|9|@]|A|$]]|$1|S|3|T|5|F|7|14|8|@]|9|@]|A|$G|H]]|$1|U|3|-4|5|6|7|15|8|@]|9|@]|A|$]]]|V|$]]

I have used the following successfully.

First revert the full commit (puts it in index) but don't commit.

<pre><code>git revert -n &lt;sha1&gt; # -n is short for --no-commit
</code></pre>

Then interactively remove the reverted GOOD changes from the index

<pre><code>git reset -p # -p is short for --patch 
</code></pre>

Then commit reverse diff of the bad changes

<pre><code>git commit -m "Partially revert &lt;sha1&gt;..."
</code></pre>

Finally the reverted GOOD changes (which have been unstaged by the reset command) are still in the working tree. They need to be cleaned up. If no other uncommitted changes are left in the working tree, this can be done by

<pre><code>git reset --hard
</code></pre>

blocks|key|811323|text|解决方案：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|811324|git+revert+--no-commit+<commit+hash>
git+reset+-p++++++++#+every+time+choose+'y'+if+you+want+keep+the+change,+otherwise+choose+'n'
git+commit+-m+"Revert+..."
git+checkout+--+.+++#+Don't+forget+to+use+it.|code-block|syntax|javascript|811325|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

Solution:

<pre><code>git revert --no-commit &lt;commit hash&gt;
git reset -p # every time choose 'y' if you want keep the change, otherwise choose 'n'
git commit -m "Revert ..."
git checkout -- . # Don't forget to use it.
</code></pre>

blocks|key|811391|text|就我个人而言，我更喜欢这个版本，它重用了自动生成的提交消息，并让用户有机会在最终提交之前编辑并插入单词“部分”。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|811392|#+generate+a+revert+commit
#+note+the+hash+printed+to+console+on+success
git+revert+--no-edit+<hash+to+revert>

#+undo+that+commit,+but+not+its+changes+to+the+working+tree
#+(reset+index+to+commit-before-last;+that+is,+one+graph+entry+up+from+HEAD)
git+reset+HEAD~1

#+interactively+add+reversions
git+add+-p

#+commit+with+pre-filled+message
git+commit+-c+<hash+from+revert+commit,+printed+to+console+after+first+command>

#+reset+the+rest+of+the+current+directory's+working+tree+to+match+git
#+this+will+reapply+the+excluded+parts+of+the+reversion+to+the+working+tree
#+you+may+need+to+change+the+paths+to+be+checked+out
#+be+careful+not+to+accidentally+overwrite+unsaved+work
git+checkout+--+.|code-block|syntax|javascript|811393|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

Personally, I prefer this version, which reuses the auto-generated commit message and gives the user the opportunity to edit and stick the word "Partially" in before finally committing.

<pre><code># generate a revert commit
# note the hash printed to console on success
git revert --no-edit &lt;hash to revert&gt;

# undo that commit, but not its changes to the working tree
# (reset index to commit-before-last; that is, one graph entry up from HEAD)
git reset HEAD~1

# interactively add reversions
git add -p

# commit with pre-filled message
git commit -c &lt;hash from revert commit, printed to console after first command&gt;

# reset the rest of the current directory's working tree to match git
# this will reapply the excluded parts of the reversion to the working tree
# you may need to change the paths to be checked out
# be careful not to accidentally overwrite unsaved work
git checkout -- .
</code></pre>

I want to revert a particular commit in git. Unfortunately, our organization still uses CVS as a standard, so when I commit back to CVS multiple git commits are rolled into one. In this case I would love to single out the original git commit, but that is impossible.

Is there an approach similar to <code>git add --patch</code> that would allow me to selectively edit diffs to decide which parts of a commit to revert?

Reverting part of a commit with git

我想在git中恢复一个特定的提交。不幸的是，我们的组织仍然使用CVS作为标准，所以当我提交回CVS时，多个git提交被合并为一个。在这种情况下，我很乐意挑选出原始的git提交，但这是不可能的。有没有一种类似于git add --patch的方法，允许我有选择地编辑差异，以决定要还原提交的哪些部分？

问使用git恢复提交的一部分
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问使用git恢复提交的一部分EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问使用git恢复提交的一部分
EN