简体繁体 English

首先是什么：git子树合并策略或git子模块？

[英]What came first: git subtree merge strategy or git submodule?

原文 2012-09-10 10:37:03 5 1 git/ history/ git-submodules/ git-subtree

What is more recent invention — git subtree merge strategy (not the new git-subtree command) or git submodule command (or maybe underlying mechanism if there was a separate one symmetrical to git subtree command vs. merge strategy). 最近的发明是git子树合并策略（不是新的git-subtree命令）或git子模块命令（或者如果与git子树命令相对应的合并策略是一个对称的，则可能是底层机制）。

What was included in Git distribution release first? Git发行版首先包含哪些内容？

Bonus points for links to relevant Git ML posts. 指向相关Git ML帖子链接的奖励积分。

I tried do dig that info from Git commit history, but got lost somewhere in 2007-2008 for both features. 我尝试从Git提交历史中挖掘该信息，但是在2007-2008年因为这两个功能而迷路了。

1 个解决方案

Subtree merge seems to be a tad older: 子树合并似乎有点老了：

Introduced by Junio Hamano in Feb 2007 68faf68938ee943fc251c702f2027e4dfda354db »Add new merge stragety [sic] 'subtree'« (file git-merge.sh ) 由Junio 68faf68938ee943fc251c702f2027e4dfda354db于2007年2月68faf68938ee943fc251c702f2027e4dfda354db »添加新的合并策略[sic]'subtree'«（文件git-merge.sh ）

Git submodule was introduced in May 2007 by Lars Hjemli in commit 70c7ac22de681a83621bda03e676348170c8d8a2 »Add git-submodule command« (file git-submodule.sh ) Git子模块于2007年5月由Lars Hjemli在commit 70c7ac22de681a83621bda03e676348170c8d8a2 »添加git-submodule命令«（文件git-submodule.sh ）中git-submodule.sh 。

To get the releases that first contained a certain feature, run git describe --contains on its commit. 要获得首先包含特定功能的发行版， git describe --contains在其提交上运行git describe --contains 。 For the above commits this means v1.5.2-rc0 and v1.5.3-rc0 , respectively. 对于上述提交，这分别意味着v1.5.2-rc0和v1.5.3-rc0 。