Hacker News new | ask | show | jobs
This commit has 6225 parents (github.com)
2 points by ward 3678 days ago
1 comments

This uses the so called "octopus" merge strategy in git as described at https://www.kernel.org/pub/software/scm/git/docs/git-merge.h...