Merge branch 'th/remote-usage' into maint

[git.git] / Documentation / git-mktree.txt

diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt
index 7336f48bd1e90dabf8e735dc27023b65309e1aef..81e3326772d94464708cc2037715e1e62eae5f11 100644 (file)
--- a/Documentation/git-mktree.txt
+++ b/Documentation/git-mktree.txt
@@ -8,7 +8,7 @@ git-mktree - Build a tree-object from ls-tree formatted text
 
 SYNOPSIS
 --------
-'git mktree' [-z] [--missing]
+'git mktree' [-z] [--missing] [--batch]
 
 DESCRIPTION
 -----------
@@ -28,6 +28,12 @@ OPTIONS
        object.  This option has no effect on the treatment of gitlink entries
        (aka "submodules") which are always allowed to be missing.
 
+--batch::
+       Allow building of more than one tree object before exiting.  Each
+       tree is separated by as single blank line. The final new-line is
+       optional.  Note - if the '-z' option is used, lines are terminated
+       with NUL.
+
 Author
 ------
 Written by Junio C Hamano <gitster@pobox.com>