summaryrefslogtreecommitdiff
path: root/Documentation/pull-fetch-param.txt
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@fieldses.org>2007-01-01 21:40:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-01 22:38:08 (GMT)
commit6f0b4ac0d730c99ab1c2962168675b920febb187 (patch)
tree31ef76e6ea291a907e6e5b4f823d2692ac7eb2ba /Documentation/pull-fetch-param.txt
parent33a59fd07d8d75e58a5b1edbcc3c5798c98aa8bf (diff)
downloadgit-6f0b4ac0d730c99ab1c2962168675b920febb187.zip
git-6f0b4ac0d730c99ab1c2962168675b920febb187.tar.gz
git-6f0b4ac0d730c99ab1c2962168675b920febb187.tar.bz2
Documentation: remove master:origin example from pull-fetch-param.txt
This is no longer a useful example. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/pull-fetch-param.txt')
-rw-r--r--Documentation/pull-fetch-param.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index e852f41..8d4e950 100644
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -39,10 +39,6 @@ checkout -b my-B remote-B`). Run `git fetch` to keep track of
the progress of the remote side, and when you see something new
on the remote branch, merge it into your development branch with
`git pull . remote-B`, while you are on `my-B` branch.
-The common `Pull: master:origin` mapping of a remote `master`
-branch to a local `origin` branch, which is then merged to a
-local development branch, again typically named `master`, is made
-when you run `git clone` for you to follow this pattern.
+
[NOTE]
There is a difference between listing multiple <refspec>