X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-pull.txt;h=cef4c0ae38d46869420ca6d317e24b279bcb6d9d;hb=6ddc0964034342519a87fe013781abf31c6db6ad;hp=c35d2eb54cfccbf8aa40d5d7a3a844f4a4d7172d;hpb=7fe2fc79358673a909d71e62d3f80ffe0f525fce;p=git.git diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index c35d2eb5..cef4c0ae 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -1,6 +1,5 @@ git-pull(1) =========== -v0.99.4, Aug 2005 NAME ---- @@ -20,11 +19,18 @@ 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 ------- include::pull-fetch-param.txt[] +-a, \--append:: + Append ref names and object names of fetched refs to the + existing contents of $GIT_DIR/FETCH_HEAD. Without this + option old data in $GIT_DIR/FETCH_HEAD will be overwritten. Author ------