[PATCH] read-tree: update documentation for 3-way merge.

[git.git] / Documentation / git-local-pull.txt

diff --git a/Documentation/git-local-pull.txt b/Documentation/git-local-pull.txt
index 53f5d3968216044d35151c5f6e56285274e3a574..4bc66e77ba0c4e9f9595c3d0e9b3794dc946637a 100644 (file)
--- a/Documentation/git-local-pull.txt
+++ b/Documentation/git-local-pull.txt
@@ -9,7 +9,7 @@ git-local-pull - Duplicates another GIT repository on a local system
 
 SYNOPSIS
 --------
-'git-local-pull' [-c] [-t] [-a] [-l] [-s] [-n] [-v] commit-id path
+'git-local-pull' [-c] [-t] [-a] [-l] [-s] [-n] [-v] [-d] [--recover] commit-id path
 
 DESCRIPTION
 -----------
@@ -23,6 +23,13 @@ OPTIONS
        Get trees associated with the commit objects.
 -a::
        Get all the objects.
+-d::
+       Do not check for delta base objects (use this option
+       only when you know the remote repository is not
+       deltified).
+--recover::
+       Check dependency of deltified object more carefully than
+       usual, to recover after earlier pull that was interrupted.
 -v::
        Report what is downloaded.