X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-pull.txt;h=cef4c0ae38d46869420ca6d317e24b279bcb6d9d;hb=6ddc0964034342519a87fe013781abf31c6db6ad;hp=bae05dee99ebaa7866885d3d8a36cde81e5d700e;hpb=1301c6eb412e7c5511b952a12e42c70ad56f028b;p=git.git diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index bae05dee..cef4c0ae 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 + to pull from the local repository -- this is useful +when merging local branches into the current branch. OPTIONS -------