mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse 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>
This commit is contained in:
Junio C Hamano
2005-11-01 14:03:13 -08:00
parent bd66361195
commit 710c97dbb1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-pull.txt
View File

@ -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. Otherwise uses 'git octopus' to merge them
into the local HEAD. 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 OPTIONS
------- -------

4
Documentation/tutorial.txt
View File

@ -1028,7 +1028,9 @@ multiple working trees, but disk space is cheap these days.
[NOTE] [NOTE]
You could even pull from your own repository by 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 It is likely that you will be pulling from the same remote
repository from time to time. As a short hand, you can store repository from time to time. As a short hand, you can store