Remove the temp file if it is empty after the request has failed

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

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 9527792..cef4c0a 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -19,11 +19,18 @@ When only one ref is downloaded, runs 'git resolve' to merge it
 into the local HEAD.  Otherwise uses 'git octopus' to merge them
 into the local HEAD.
 
 into the local HEAD.  Otherwise uses 'git octopus' to merge them
 into the local HEAD.
 

+Note that you can use '.' (current directory) as the
+<repository> to pull from the local repository -- this is useful
+when merging local branches into the current branch.

 
 OPTIONS
 -------
 include::pull-fetch-param.txt[]
 
 
 OPTIONS
 -------
 include::pull-fetch-param.txt[]
 

+-a, \--append::
+       Append ref names and object names of fetched refs to the
+       existing contents of $GIT_DIR/FETCH_HEAD.  Without this
+       option old data in $GIT_DIR/FETCH_HEAD will be overwritten.

 
 Author
 ------
 
 Author
 ------