@matheusbsbs / matheus-bagliano / commits / 710c97dbb1
Fork 0

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>

Junio C Hamano committed Nov 1, 2005 at 14:03 UTC 710c97dbb1a4469816ae01f4a26661cdba2c401b
2 files changed +6 -1
Documentation/git-pull.txt
+3
@@ -19,6 +19,9 @@ When only one ref is downloaded, runs 'git resolve' to merge it
19 into the local HEAD. Otherwise uses 'git octopus' to merge them
20 into the local HEAD.
21
22 +Note that you can use '.' (current directory) as the
23 +<repository> to pull from the local repository -- this is useful
24 +when merging local branches into the current branch.
25
26 OPTIONS
27 -------
Documentation/tutorial.txt
+3 -1
@@ -1028,7 +1028,9 @@ multiple working trees, but disk space is cheap these days.
1028
1029 [NOTE]
1030 You could even pull from your own repository by
1031 -giving '.' as <remote-repository> parameter to `git pull`.
1031 +giving '.' as <remote-repository> parameter to `git pull`. This
1032 +is useful when you want to merge a local branch (or more, if you
1033 +are making an Octopus) into the current branch.
1034
1035 It is likely that you will be pulling from the same remote
1036 repository from time to time. As a short hand, you can store