3 ms·
In case anybody hasn't tried it yet: It is pretty cool to check out the first copy of git that was committed to git. It is incredibly simple, yet was sufficien
by Crito 12y ago
In case anybody hasn't tried it yet: It is pretty cool to check out the first copy of git that was committed to git. It is incredibly simple, yet was sufficient to create a commit that is still in the same git repo as modern git.
https://github.com/git/git/commit/e83c5163316f89bfbde7d9ab23ca2e25604af290 https://github.com/git/git/commit/e83c5163316f89bfbde7d9ab23...
- xorcist 12y agoI love how it's equal parts code and animated gifs. Quite different from the initial reception at LKML. And says a lot about what it made possible, even if indirectly.
- scrollaway 12y agoThis is interesting: https://github.com/git/git/commit/e83c5163316f89bfbde7d9ab23ca2e25604af290#diff-ca7628e295e2c5654dbdec183d70158dR94 https://github.com/git/git/commit/e83c5163316f89bfbde7d9ab23... A commit having multiple parents is not possible in git as of today. Change of mind?
- alblue 12y agoIt is possible for a git commit to have zero parents (initial commit), one parent (the direct ancestor in a linear path), two parents (generally referred to as a merge node) and more than two parents (also referred to as a merge but only possible using the octopus strategy).
- scrollaway 12y agoAh, of course, merge nodes have multiple parents. I had never heard of octopus merges though. It's fascinating. Here[1] is the article I read on it. [1] https://developer.atlassian.com/blog/2015/01/git-merge-distinct-octopus-merge/ https://developer.atlassian.com/blog/2015/01/git-merge-disti...