diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 10:40:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 10:40:10 -0700 |
commit | b389237ae8cd04c2f53db52e37c02e30c63bcc89 (patch) | |
tree | 39a61c090453e0efd5329e5732f8c1e74f6db2ef /diffcore.h | |
parent | Fix up INSTALL and "git add" (diff) | |
download | tgif-b389237ae8cd04c2f53db52e37c02e30c63bcc89.tar.xz |
git-commit-tree: ignore duplicate parents
But warn about them. If somebody really ends up later wanting to
explicitly add a note that something has the same parent twice (who
knows, there are strange people around), we can add a flag to say that
it's expected and ok.
This was brought on by a commit in the kernel tree, where a repeated
merge caused a duplicate parent.
Parent duplicates aren't "wrong" per se, they're just in practice not
something you are ever interested in.
Diffstat (limited to 'diffcore.h')
0 files changed, 0 insertions, 0 deletions