![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@osdl.org> | |
| Thu, 29 Sep 2005 15:16:12 +0000 (08:16 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 2 Oct 2005 17:42:46 +0000 (10:42 -0700) | ||
| commit | 23822a355de674f1d1321ad7e112f0fe40124aca | |
| tree | cf55bb5fa5718e35b3b2ecc9fc1f35699aac2f67 | tree | snapshot |
| parent | 500b97e4bb184c954a52550843e6314ecf97a208 | commit | 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>
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>
| read-tree.c | diff | blob | history |