diff options
| author |  Linus Torvalds <torvalds@osdl.org> | 2005-09-29 08:16:12 -0700 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-10-02 10:42:46 -0700 |
| commit | 23822a355de674f1d1321ad7e112f0fe40124aca (patch) | |
| tree | cf55bb5fa5718e35b3b2ecc9fc1f35699aac2f67 /Documentation/git-reset.txt | |
| parent | [PATCH] Teach git-ls-files about '--' to denote end of options. (diff) | |
| download | tgif-23822a355de674f1d1321ad7e112f0fe40124aca.tar.xz | |
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 'Documentation/git-reset.txt')
0 files changed, 0 insertions, 0 deletions