summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-06-09 23:13:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-06-09 23:13:08 (GMT)
commit5bcde3082d5f348ff8b02547126746b9b713c8d5 (patch)
treea9fa14b89706e6bfd0dfcd22000d6d3b77c55cdd /Documentation/git-read-tree.txt
parent3c076dbe3cffee3b5cbf34759d627c47a417c145 (diff)
parent22e801f285eefb9d5887091741e19a2c4f9798bf (diff)
downloadgit-5bcde3082d5f348ff8b02547126746b9b713c8d5.zip
git-5bcde3082d5f348ff8b02547126746b9b713c8d5.tar.gz
git-5bcde3082d5f348ff8b02547126746b9b713c8d5.tar.bz2
Merge branch 'maint'
* maint: git-read-tree: document -v option. Remove exec bit from builtin-fast-export.c
Diffstat (limited to 'Documentation/git-read-tree.txt')
-rw-r--r--Documentation/git-read-tree.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index cbe6835..58fb906 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -50,6 +50,9 @@ OPTIONS
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