path: root/Documentation/git-pull.txt
diff options
authorNicolas Pitre <>2007-01-15 03:44:18 (GMT)
committerJunio C Hamano <>2007-01-15 05:12:14 (GMT)
commitc14261eaa297504799e3b21ecbd751edbae912c0 (patch)
tree26729b99c1fdc3549bdc12aef9c3e8d55eb59983 /Documentation/git-pull.txt
parentadb7ba6b116c0ec26e058b9b41a5a528d123323f (diff)
some doc updates
1) talk about "git merge" instead of "git pull ." 2) suggest "git repo-config" instead of directly editing config files 3) echo "URL: blah" > .git/remotes/foo is obsolete and should be "git repo-config blah" 4) support for partial URL prefix has been removed (see commit ea560e6d64374ec1f6c163c276319a3da21a1345) so drop mention of it. Signed-off-by: Nicolas Pitre <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-pull.txt')
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 13be992..a90b764 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -52,7 +52,8 @@ git pull origin next::
git pull . fixes enhancements::
Bundle local branch `fixes` and `enhancements` on top of
- the current branch, making an Octopus merge.
+ the current branch, making an Octopus merge. This `git pull .`
+ syntax is equivalent to `git merge`.
git pull -s ours . obsolete::
Merge local branch `obsolete` into the current branch,