[PATCH] cat-file: be consistent in usage string and documentation.
[alt-git.git] / git-pull-script
blob8e309fc98b97659d08061b0e1f1e6d4f1e43fc32
1 #!/bin/sh
3 . git-sh-setup-script || die "Not a git archive"
5 merge_repo=$1
7 merge_name=$(echo "$1" | sed 's:\.git/*$::')
8 merge_head=HEAD
9 type=head
10 if [ "$2" = "tag" ]; then
11 type=tag
12 shift
14 if [ "$2" ]
15 then
16 merge_name="$type '$2' of $merge_name"
17 merge_head="refs/${type}s/$2"
20 git-fetch-script "$merge_repo" "$merge_head" || exit 1
22 git-resolve-script \
23 "$(cat "$GIT_DIR"/HEAD)" \
24 "$(cat "$GIT_DIR"/FETCH_HEAD)" \
25 "Merge $merge_name"