I was working with a friend on a project, and he edited a bunch of files that shouldn't have been edited. Somehow I merged his work into mine, either when I pulled it, or when I tried to just pick the specific files out that I wanted. I've been looking and playing for a long time, trying to figure out how to remove the commits that contain the edits to those files, it seems to be a toss up between revert and rebase, and there are no straightforward examples, and the docs assume I know more than I do.
下面是这个问题的简化版本:
给定下面的场景，我如何删除提交2?
$ mkdir git_revert_test && cd git_revert_test
$ git init
Initialized empty Git repository in /Users/josh/deleteme/git_revert_test/.git/
$ echo "line 1" > myfile
$ git add -A
$ git commit -m "commit 1"
[master (root-commit) 8230fa3] commit 1
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 myfile
$ echo "line 2" >> myfile
$ git commit -am "commit 2"
[master 342f9bb] commit 2
1 files changed, 1 insertions(+), 0 deletions(-)
$ echo "line 3" >> myfile
$ git commit -am "commit 3"
[master 1bcb872] commit 3
1 files changed, 1 insertions(+), 0 deletions(-)
预期的结果是
$ cat myfile
line 1
line 3
以下是我一直试图恢复的一个例子
$ git revert 342f9bb
Automatic revert failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
and commit the result.
Git在计算要恢复的差异时使用的算法需要这样做
任何以后的提交都不会修改被还原的行。
在以后的历史中没有任何其他“相邻”提交。
“相邻”的定义基于上下文差异的默认行数，即3。如果'myfile'是这样构造的:
$ cat >myfile <<EOF
line 1
junk
junk
junk
junk
line 2
junk
junk
junk
junk
line 3
EOF
$ git add myfile
$ git commit -m "initial check-in"
1 files changed, 11 insertions(+), 0 deletions(-)
create mode 100644 myfile
$ perl -p -i -e 's/line 2/this is the second line/;' myfile
$ git commit -am "changed line 2 to second line"
[master d6cbb19] changed line 2
1 files changed, 1 insertions(+), 1 deletions(-)
$ perl -p -i -e 's/line 3/this is the third line/;' myfile
$ git commit -am "changed line 3 to third line"
[master dd054fe] changed line 3
1 files changed, 1 insertions(+), 1 deletions(-)
$ git revert d6cbb19
Finished one revert.
[master 2db5c47] Revert "changed line 2"
1 files changed, 1 insertions(+), 1 deletions(-)
然后一切都按预期工作。
第二个答案非常有趣。有一个尚未正式发布的特性(尽管在Git v1.7.2-rc2中可用)称为恢复策略。你可以像这样调用git:
Git revert—strategy resolve <commit>
它应该能更好地理解你的意思。我不知道可用的策略列表是什么，也不知道任何策略的定义。
所以你做了一些工作并推动了它，我们称之为提交A和b。你的同事也做了一些工作，提交C和d。你将你同事的工作合并到你的工作中(合并提交E)，然后继续工作，也提交了(提交F)，然后发现你的同事修改了一些他不应该修改的东西。
你的提交历史是这样的:
A -- B -- C -- D -- D' -- E -- F
你真的想摆脱C D D'既然你说你将同事的工作合并到你的工作中，这些提交已经“存在”了，所以使用git rebase等方法删除这些提交是不可以的。相信我，我试过了。
现在，我看到了两条出路:
if you haven't pushed E and F to your coworker or anyone else (typically your "origin" server) yet, you could still remove those from the history for the time being. This is your work that you want to save. This can be done with a
git reset D'
(replace D' with the actual commit hash that you can obtain from a git log
At this point, commits E and F are gone and the changes are uncommitted changes in your local workspace again. At this point I would move them to a branch or turn them into a patch and save it for later. Now, revert your coworker's work, either automatically with a git revert or manually. When you've done that, replay your work on top of that. You may have merge conflicts, but at least they'll be in the code you wrote, instead of your coworker's code.
If you've already pushed the work you did after your coworker's commits, you can still try and get a "reverse patch" either manually or using git revert, but since your work is "in the way", so to speak you'll probably get more merge conflicts and more confusing ones. Looks like that's what you ended up in...
听起来好像坏提交在某个时候被合并提交了。你的合并提交被拉回来了吗?如果是，那么你将使用git revert;你必须咬紧牙关，克服矛盾。如果不是，那么您可以选择rebase或revert，但是您可以在合并提交之前这样做，然后重做合并。
There's not much help we can give you for the first case, really. After trying the revert, and finding that the automatic one failed, you have to examine the conflicts and fix them appropriately. This is exactly the same process as fixing merge conflicts; you can use git status to see where the conflicts are, edit the unmerged files, find the conflicted hunks, figure out how to resolve them, add the conflicted files, and finally commit. If you use git commit by itself (no -m <message>), the message that pops up in your editor should be the template message created by git revert; you can add a note about how you fixed the conflicts, then save and quit to commit.
对于第二种情况，在合并之前修复问题，有两个子情况，这取决于合并后您是否做了更多的工作。如果你还没有，你可以简单地git重置-硬头^取消合并，做还原，然后重新合并。但我猜你有。所以，你最终会这样做:
在合并之前创建一个临时分支，并签出它
进行还原(或使用git rebase -i <something before bad commit> <temporary branch>来删除bad commit)
重做合并
将你的后续工作重新基于:git Rebase—to <临时分支> <旧合并提交> <实际分支>
移除临时分支
有四种方法:
干净的方式，恢复，但保持日志恢复:
Git revert—strategy resolve <commit>
严厉的方式，完全删除只有最后一个提交:
git重置-软“头^”
注意:避免git重置——很难，因为它也会丢弃自上次提交以来文件中的所有更改。如果——软的不行，那就试试——混合的或者——保留的。
Rebase(显示最近5次提交的日志并删除你不想要的行，或重新排序，或将多个提交压缩在一个文件中，或做任何你想做的事情，这是一个非常通用的工具):
git rebase -i HEAD~5
如果犯了错误:
git rebase --abort
快速rebase:只删除使用id的特定提交:
Git rebase—to commit-id^ commit-id
替代方案:你还可以试试:
Git选择commit-id
还有另一种选择:
Git恢复——不提交
作为最后的手段，如果你需要完全自由的历史编辑(例如，因为git不允许你编辑你想要的内容)，你可以使用这个非常快速的开源应用程序:reposurgeon。
注意:当然，所有这些更改都是在本地完成的，你应该在git push之后将更改应用到远程。如果你的repo不想删除提交(“不允许快进”，当你想删除已经提交的提交时就会发生)，你可以使用git push -f强制推送更改。
注2:如果在一个分支上工作，你需要强制push，你应该绝对避免git push——force，因为这可能会覆盖其他分支(如果你对它们做了更改，即使你当前的签出是在另一个分支上)。当你强制push时，最好总是指定远程分支:git push——force origin your_branch。
