commit | 23822a355de674f1d1321ad7e112f0fe40124aca | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@osdl.org> | Thu Sep 29 08:16:12 2005 -0700 |
committer | Junio C Hamano <junkio@cox.net> | Sun Oct 02 10:42:46 2005 -0700 |
tree | cf55bb5fa5718e35b3b2ecc9fc1f35699aac2f67 | |
parent | 500b97e4bb184c954a52550843e6314ecf97a208 [diff] |
read-tree: --trivial This adds an option --trivial to restrict 3-way 'read-tree -m -u' to happen only if there is no file-level merging required. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>