mirror of
https://github.com/git/git
synced 2024-08-27 03:29:21 +00:00
Merge branch 'maint'
* maint: git-read-tree: document -v option. Remove exec bit from builtin-fast-export.c
This commit is contained in:
commit
5bcde3082d
|
@ -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
|
||||
|
|
0
builtin-fast-export.c
Executable file → Normal file
0
builtin-fast-export.c
Executable file → Normal file
Loading…
Reference in a new issue