From 170e095a9cfe31617162e8a9b5063b8bc38af82b Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Sun, 8 Jun 2008 16:40:13 +0200 Subject: Remove exec bit from builtin-fast-export.c Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- builtin-fast-export.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 builtin-fast-export.c diff --git a/builtin-fast-export.c b/builtin-fast-export.c old mode 100755 new mode 100644 -- cgit v1.3-5-g9baa From 22e801f285eefb9d5887091741e19a2c4f9798bf Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 9 Jun 2008 22:25:15 +0200 Subject: git-read-tree: document -v option. Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano --- Documentation/git-read-tree.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 8421d1fd78..c95ad9f145 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 -- cgit v1.3-5-g9baa