summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-01 22:03:13 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-01 22:03:13 (GMT)
commit710c97dbb1a4469816ae01f4a26661cdba2c401b (patch)
treeb9f089c1d3dc1bb2792cfcd0e6b9c56f271045e9 /Documentation/git-pull.txt
parentbd66361195c5503261a2d1eef6aa685deb058ffb (diff)
downloadgit-710c97dbb1a4469816ae01f4a26661cdba2c401b.zip
git-710c97dbb1a4469816ae01f4a26661cdba2c401b.tar.gz
git-710c97dbb1a4469816ae01f4a26661cdba2c401b.tar.bz2
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>
Diffstat (limited to 'Documentation/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index bae05de..cef4c0a 100644
--- 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
-------