diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-01 14:03:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-01 14:03:13 -0800 |
| commit | 710c97dbb1a4469816ae01f4a26661cdba2c401b (patch) | |
| tree | b9f089c1d3dc1bb2792cfcd0e6b9c56f271045e9 | |
| parent | bd66361195c5503261a2d1eef6aa685deb058ffb (diff) | |
| download | git-710c97dbb1a4469816ae01f4a26661cdba2c401b.tar.gz git-710c97dbb1a4469816ae01f4a26661cdba2c401b.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-pull.txt | 3 | ||||
| -rw-r--r-- | Documentation/tutorial.txt | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index bae05dee9..cef4c0ae3 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 ------- diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index b9f737e96..20a4cb1df 100644 --- 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 |