summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 170e095)
raw | patch | inline | side by side (parent: 170e095)
author | Miklos Vajna <vmiklos@frugalware.org> | |
Mon, 9 Jun 2008 20:25:15 +0000 (22:25 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 9 Jun 2008 22:49:44 +0000 (15:49 -0700) |
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-read-tree.txt | patch | blob | history |
index 8421d1fd78f245f6a80a04c880c455ca8bae0eed..c95ad9f1451fd5db2e4fcbdb64f606f81f39ff14 100644 (file)
trees that are not directly related to the current
working tree status into a temporary index file.
+-v::
+ Show the progress of checking files out.
+
--trivial::
Restrict three-way merge by `git-read-tree` to happen
only if there is no file-level merging required, instead