English 中文(简体)
Git 将 hash A 和 B 之间的更改更改到工作目录
原标题:Git get changes between hash A and B to working directory
  • 时间:2012-05-23 08:29:57
  •  标签:
  • git
  • diff

在hash A和hash B之间(分支最近的是Z, 以后有数千个承诺),对hash A和hash B之间作了一些修改。我希望HEAD(我的本地一个)指向hash A,并在我的工作目录中列出A和B之间所作的所有修改。

为什么?因为Git diff不方便,我宁可用我的 IDE (IntelliJIDA) 的 diff 工具工作。 但为此,我需要说服 IDE 说我已经更改了文件 - 因此请求。

最佳回答

其实我找到了一个方法:

git checkout <hash A>
git diff –patch <hash A> <hash B> > patch.patch
patch –p1 –N < patch.patch

一位同事也告诉我,我可以使用

git checkout <hash A>
git merge --squash <hash B>

- 但我还没测试呢

问题回答

你可以:

  • git clone your local repo and reset it to hashB (see "Git clone particular version of remote repository")
  • git reset hashA within your local repo
  • empty its content and replace it: Git Plugin within IDEA will detect all the files added, missing or modified compared to current HEAD.




相关问题
git confusion - cloning a repo is returning a past version

Im having some confusion with my git usage. I cloned a repo from one comp to the other, and the new clone is the state of the original that was active some time ago. So its cloning a past version. ...

Appropriate strategy for tagging and hotfixing with git

I was wondering if the strategy I m using for tagging and hotfixing tags (which then I use for deploying rails applications) with git is appropriate. For tagging I just tag a commit of the master ...

Tips on upgrading CVS to git/hg?

We still use CVS, I use git and hg for my personal use though I m still a novice at both, but I realize they re much more modern and better, faster, distributed, etc. It s just everyone is so ...

Using Git in a TFS shop

Using Git at home has spoiled me - I now find using TFS at work to be a bit of a drag and want to explore the possibility of using Git locally and syncing somehow with TFS. I figure there are a few ...

热门标签