7ef76925d9
This allows you to just fetch stuff first, inspect it, and then resolve the merge separately if everything looks good.
15 lines
282 B
Bash
Executable File
15 lines
282 B
Bash
Executable File
#!/bin/sh
|
|
#
|
|
merge_repo=$1
|
|
merge_name=${2:-HEAD}
|
|
|
|
: ${GIT_DIR=.git}
|
|
: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
|
|
|
|
git-fetch-script "$merge_repo" "$merge_name"
|
|
|
|
git-resolve-script \
|
|
"$(cat "$GIT_DIR"/HEAD)" \
|
|
"$(cat "$GIT_DIR"/MERGE_HEAD)" \
|
|
"$merge_repo"
|