mirror of
https://github.com/git/git.git
synced 2024-11-06 09:13:01 +01:00
521003ff52
With this, you can finally say "git pull jgarzik sil24 pdc2027x". Signed-off-by: Junio C Hamano <junkio@cox.net>
26 lines
601 B
Bash
Executable file
26 lines
601 B
Bash
Executable file
#!/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"
|