标签:HEAD Git TortoiseGit MERGE other commit hash
In TortoiseGit, which one is MERGE_HEAD and which one is HEAD?
They are both local (this is important, albeit not very helpful :-) ).
HEAD
is your current branch, which means the one you have checked out now. For git merge
that's the one you had checked out when you started.
MERGE_HEAD
is the other commit, which means the hash ID of the commit you told Git to merge. That is, git merge origin/master
resolves origin/master
to some local commit hash ID, and then merges that commit, and MERGE_HEAD
contains the hash ID of that commit.
I think a better term for the other commit is other or --theirs
, and Git sometimes uses those terms, but other bits of Git do use the term remote to refer to the --theirs
commit.
标签:HEAD,Git,TortoiseGit,MERGE,other,commit,hash 来源: https://www.cnblogs.com/chucklu/p/14306664.html
本站声明: 1. iCode9 技术分享网(下文简称本站)提供的所有内容,仅供技术学习、探讨和分享; 2. 关于本站的所有留言、评论、转载及引用,纯属内容发起人的个人观点,与本站观点和立场无关; 3. 关于本站的所有言论和文字,纯属内容发起人的个人观点,与本站观点和立场无关; 4. 本站文章均是网友提供,不完全保证技术分享内容的完整性、准确性、时效性、风险性和版权归属;如您发现该文章侵犯了您的权益,可联系我们第一时间进行删除; 5. 本站为非盈利性的个人网站,所有内容不会用来进行牟利,也不会利用任何形式的广告来间接获益,纯粹是为了广大技术爱好者提供技术内容和技术思想的分享性交流网站。