aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorRobin Rosenberg <robin.rosenberg@dewire.com>2006-10-29 21:09:40 +0100
committerJunio C Hamano <junkio@cox.net>2006-10-29 12:36:27 -0800
commitce4231ffa80da1888a668cc7c33f5349800ab4a3 (patch)
tree7e53e1c679fe9ea79446c11d2df1d382b1faa3f4 /Documentation
parent151602df00b8e5c5b4a8193f59a94b85f9b5aebc (diff)
downloadgit-ce4231ffa80da1888a668cc7c33f5349800ab4a3.tar.gz
git-ce4231ffa80da1888a668cc7c33f5349800ab4a3.tar.xz
Mention that pull can work locally in the synopsis
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-pull.txt2
-rw-r--r--Documentation/git.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 51577fcbe..2a5aea73b 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -3,7 +3,7 @@ git-pull(1)
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 595cca1ef..fff07e100 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -324,7 +324,7 @@ gitlink:git-mv[1]::
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.