summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 151602d)
raw | patch | inline | side by side (parent: 151602d)
author | Robin Rosenberg <robin.rosenberg@dewire.com> | |
Sun, 29 Oct 2006 20:09:40 +0000 (21:09 +0100) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sun, 29 Oct 2006 20:36:27 +0000 (12:36 -0800) |
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-pull.txt | patch | blob | history | |
Documentation/git.txt | patch | blob | history |
index 51577fcbe638981baf1870006eef633be304e26b..2a5aea73bafedd62f20cecb1fbf5069b515022bd 100644 (file)
NAME
----
-git-pull - Pull and merge from another repository
+git-pull - Pull and merge from another repository or a local branch
SYNOPSIS
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 595cca1efda159390149bfcaf96084520ef738e3..fff07e10020f41afddb374343544e768d2f882b2 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
Move or rename a file, a directory, or a symlink.
gitlink:git-pull[1]::
- Fetch from and merge with a remote repository.
+ Fetch from and merge with a remote repository or a local branch.
gitlink:git-push[1]::
Update remote refs along with associated objects.