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.
333 Commits
6 Branches
36 Tags
131 MiB
 
 
 
 
 
 
Tree: d5a72fd622
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'd5a72fd622'
${ noResults }
git/git-pull-script

15 lines
414 B
Raw Blame History

#!/bin/sh
#
# use "$1" or something in a real script, this
# just hard-codes it.
#
merge_repo=$1
merge_name=${2:-HEAD}
echo "Getting object database"
rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/.
echo "Getting remote $merge_name"
rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1
git-resolve-script "$(cat .git/HEAD)" "$(cat .git/MERGE_HEAD)" "$merge_repo"