Document the use of "current directory" as pull source.

The repository to pull from can be a local repository, and as a
special case the current directory can be specified to perform
merges across local branches.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index bae05dee99ebaa7866885d3d8a36cde81e5d700e..cef4c0ae38d46869420ca6d317e24b279bcb6d9d 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -19,6 +19,9 @@ 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.
 
+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
 -------

diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index b9f737e9640a4a4a5c9554c8d6bdd1b7847ec5b2..20a4cb1df40004ce3f73e52bae5fc71522bacaf1 100644 (file)
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -1028,7 +1028,9 @@ multiple working trees, but disk space is cheap these days.
 
 [NOTE]
 You could even pull from your own repository by
-giving '.' as <remote-repository> parameter to `git pull`.
+giving '.' as <remote-repository> parameter to `git pull`.  This
+is useful when you want to merge a local branch (or more, if you
+are making an Octopus) into the current branch.
 
 It is likely that you will be pulling from the same remote
 repository from time to time. As a short hand, you can store