diff options
| -rw-r--r-- | Documentation/git-read-tree.txt | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | builtin-fast-export.c | 0 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index cbe68352bf..58fb906ef6 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 diff --git a/builtin-fast-export.c b/builtin-fast-export.c index 1dfc01e8f0..1dfc01e8f0 100755..100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c |