mirror of
https://github.com/git/git.git
synced 2024-09-22 00:57:51 +02:00
3ba513c32e
It used to do "Merge $3" as the message, but that ends up being inconvenient, and much more easily done inside git-pull-script instead. This makes the third argument to "git resolve" much easier to explain.
26 lines
454 B
Bash
Executable File
26 lines
454 B
Bash
Executable File
#!/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"
|