Linus Torvalds 23822a355d 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>

2005-10-02 10:42:46 -07:00

15 KiB

Raw Blame History

View Raw