I am experimenting with git-subtree (the tool recently added to contrib, not the merge strategy) and I have stumbled upon some problems with rebasing.
git-subtree's commits are relative to the subrepo's root, so in a rebase, all files from the subrepo are added to my main repo's root. I tried squashing all the git-subtree commits, including the final merge, into one. Rebasing then worked as expected, but instead it seems like git-subtree couldn't find its own "special" commits, which gave the error "Can't squash-merge: '<subrepo>' was never added." when trying to pull/push. Suggestions? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/MrZa6xB0b94J. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.