diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-07-16 00:17:42 -0700 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 09:23:06 -0700 |
| commit | 0c04094bc153ef1073524267b4eb49989c7b8ccb (patch) | |
| tree | 29413b70d9271859636ae3f00462ea3347c4916a /Documentation/git-pull-script.txt | |
| parent | [PATCH] fetch/pull: short-hand notation for remote repositories. (diff) | |
| download | tgif-0c04094bc153ef1073524267b4eb49989c7b8ccb.tar.xz | |
[PATCH] Documentation: describe short-hand used in fetch/pull.
Describe short-hand for remote repository used in fetch/pull.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/git-pull-script.txt')
| -rw-r--r-- | Documentation/git-pull-script.txt | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Documentation/git-pull-script.txt b/Documentation/git-pull-script.txt index 44fd09a97a..ec1e7a2a90 100644 --- a/Documentation/git-pull-script.txt +++ b/Documentation/git-pull-script.txt @@ -4,22 +4,28 @@ v0.1, May 2005 NAME ---- -git-pull-script - Script used by Linus to pull and merge a remote repository +git-pull-script - Pull and merge from another repository. SYNOPSIS -------- -'git-pull-script' +'git-pull-script' <repository> [ <head> | tag <tag> ] + DESCRIPTION ----------- -This script is used by Linus to pull from a remote repository and perform -a merge. +Runs 'git-fetch-script' with the given parameters, then +'git-resolve-script' to merge the local HEAD and FETCH_HEAD. + + +OPTIONS +------- +include::pull-fetch-param.txt[] Author ------ -Written by Linus Torvalds <torvalds@osdl.org> +Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net> Documentation -------------- |