undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-read-tree: document -v option.
  Remove exec bit from builtin-fast-export.c
This commit is contained in:
Junio C Hamano 2008-06-09 16:13:08 -07:00
commit 5bcde3082d
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-read-tree.txt
View File

@ -50,6 +50,9 @@ OPTIONS
trees that are not directly related to the current trees that are not directly related to the current
working tree status into a temporary index file. working tree status into a temporary index file.
-v::
Show the progress of checking files out.
--trivial:: --trivial::
Restrict three-way merge by `git-read-tree` to happen Restrict three-way merge by `git-read-tree` to happen
only if there is no file-level merging required, instead only if there is no file-level merging required, instead

0
builtin-fast-export.c Executable file → Normal file
View File