{"thread":{"id":"2286","subject":"[PATCH] Note that '.' is a useful value for <repository> in git-pull.","startedAt":"2005-11-01T03:28:16Z","lastAt":"2005-11-01T03:28:16Z","messageCount":1,"participants":["Daniel Barkalow"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"10915","messageId":"Pine.LNX.4.64.0510312220230.25300@iabervon.org","threadId":"2286","inReplyTo":null,"subject":"[PATCH] Note that '.' is a useful value for <repository> in git-pull.","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2005-11-01T03:28:16Z","receivedAt":"2005-11-01T03:28:16Z","isPatch":true,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"Mention in the tutorial and in the documentation for git-pull that you can \nmerge local branches with all the bells and whistles with \n\"git pull . <branch>\"\n\nSigned-off-by: Daniel Barkalow <barkalow@iabervon.org>\n---\n\n\"git pull . <branch>\" does, in fact, do exactly what I wanted, and, when \nthe tutorial mentioned that you could do this, it didn't mention why you \nmight want to.\n\n Documentation/git-pull.txt |    3 ++-\n Documentation/tutorial.txt |   12 ++++++++++--\n 2 files changed, 12 insertions(+), 3 deletions(-)\n\napplies-to: 8c8ace55eb085e930dcc9482f7cf66f9399374b4\n0ba51e8c8298aff4256bd63289071f23b4d83db3\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex bae05de..fe0c18a 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -13,7 +13,8 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Runs 'git-fetch' with the given parameters.\n+Runs 'git-fetch' with the given parameters. This is effectively\n+skipped if the repository is '.'\n \n When only one ref is downloaded, runs 'git resolve' to merge it\n into the local HEAD.  Otherwise uses 'git octopus' to merge them\ndiff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt\nindex b9f737e..78443a9 100644\n--- a/Documentation/tutorial.txt\n+++ b/Documentation/tutorial.txt\n@@ -1027,8 +1027,16 @@ course, you will pay the price of more d\n multiple working trees, but disk space is cheap these days.\n \n [NOTE]\n-You could even pull from your own repository by\n-giving '.' as <remote-repository> parameter to `git pull`.\n+\n+One useful special case is\n+\n+\tgit pull . <branch-name>\n+\n+which does about the same thing as the `git resolve` calls for merging\n+local branches, except that you don't have to type in the message or\n+the side you're merging into (which is the branch that you have\n+checked out).\n+\n \n It is likely that you will be pulling from the same remote\n repository from time to time. As a short hand, you can store\n---\n0.99.8.GIT\n"}]}