kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1584 Commits
6 Branches
36 Tags
131 MiB
 
 
 
 
 
 
Tree: 52a22d1e72
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '52a22d1e72'
${ noResults }
git/git-pull-script

26 lines
601 B
Raw Blame History

#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
# Fetch one or more remote refs and merge it/them into the current HEAD.
. git-sh-setup-script || die "Not a git archive"
git-fetch-script "$@" || exit 1
merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
merge_name=$(sed -e 's/^[0-9a-f]* //' "$GIT_DIR"/FETCH_HEAD |
tr '\012' ' ')
case "$merge_head" in
'')
echo >&2 "No changes."
exit 0
;;
*' '?*)
echo >&2 "Pulling more than one heads; making an Octopus."
exec git-octopus-script
;;
esac
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
$merge_head "Merge $merge_name"