diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-10 03:13:08 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-10 03:13:08 +0400 |
| commit | 5bcde3082d5f348ff8b02547126746b9b713c8d5 (patch) | |
| tree | a9fa14b89706e6bfd0dfcd22000d6d3b77c55cdd | |
| parent | 3c076dbe3cffee3b5cbf34759d627c47a417c145 (diff) | |
| parent | 22e801f285eefb9d5887091741e19a2c4f9798bf (diff) | |
Merge branch 'maint'
* maint:
git-read-tree: document -v option.
Remove exec bit from builtin-fast-export.c
| -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 |