Revision 71931c19658bd99747ebbb93f0155384ba97df2c authored by Linus Torvalds on 15 July 2005, 21:57:09 UTC, committed by Linus Torvalds on 15 July 2005, 21:57:09 UTC
Fix 'git-var.txt' and use "-b xhtml11" instead of "-b css-embedded" to make asciidoc 7.0.1 happy.
1 parent 3eb5128
git-pull-script
#!/bin/sh
#
. git-sh-setup-script || die "Not a git archive"
merge_repo=$1
merge_name=$(echo "$1" | sed 's:\.git/*$::')
merge_head=HEAD
type=head
if [ "$2" = "tag" ]; then
type=tag
shift
fi
if [ "$2" ]
then
merge_name="$type '$2' of $merge_name"
merge_head="refs/${type}s/$2"
fi
git-fetch-script "$merge_repo" "$merge_head" || exit 1
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
"$(cat "$GIT_DIR"/FETCH_HEAD)" \
"Merge $merge_name"
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...