在hash A和hash B之间(分支最近的是Z, 以后有数千个承诺),对hash A和hash B之间作了一些修改。我希望HEAD(我的本地一个)指向hash A,并在我的工作目录中列出A和B之间所作的所有修改。
为什么?因为Git diff不方便,我宁可用我的 IDE (IntelliJIDA) 的 diff 工具工作。 但为此,我需要说服 IDE 说我已经更改了文件 - 因此请求。
在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 repoHEAD
.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. ...
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 ...
I have a svn repo with various apps as subdirectory of a single svn repo. That worked because I could have checked out a partial, repo. As I cant do that with git obviously I need multiple repos. I ...
I understand how to merge branches together in git, and I love how easy it makes it. I have a branch that looks like this: project/ |--subproj1/ | |---(files) | |--subproj2/ |---(files) A ...
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 ...
I get this on every git svn command I try. I am using git version 1.6.4.2 on OS 10.6 The initial git svn fetch works, and i can do further fetches after that, but they do not enter the log or update ...
Given I have a master branch and a other branch. In the other branch are files I don t want to commit (e.g. log files) so I ignored them in .gitignore. When I switch to the master branch, these ...
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 ...