X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-pull.txt;h=cef4c0ae38d46869420ca6d317e24b279bcb6d9d;hb=50496b2170cbe87b4c13f89f274aa2f181522bb9;hp=952779292b56ad70aae4d287357a8ca3db61414c;hpb=f865a2ad981f72423aa1c19412ce57c543801957;p=git.git diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 95277929..cef4c0ae 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -19,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 ------