diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2005-09-29 19:16:12 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-02 21:42:46 +0400 |
| commit | 23822a355de674f1d1321ad7e112f0fe40124aca (patch) | |
| tree | cf55bb5fa5718e35b3b2ecc9fc1f35699aac2f67 /git-merge.sh | |
| 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>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions