projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make "git commit" work correctly in the presense of a manual merge
[git.git]
/
git-pull-script
diff --git
a/git-pull-script
b/git-pull-script
index
49f42b5
..
dbef56c
100755
(executable)
--- a/
git-pull-script
+++ b/
git-pull-script
@@
-6,16
+6,14
@@
merge_name=$(echo "$1" | sed 's:\.git/*$::')
merge_head=HEAD
if [ "$2" ]
then
merge_head=HEAD
if [ "$2" ]
then
- merge_name="'$2' branch from
-
- $merge_name"
+ merge_name="'$2' branch of $merge_name"
merge_head="refs/heads/$2"
fi
: ${GIT_DIR=.git}
: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
merge_head="refs/heads/$2"
fi
: ${GIT_DIR=.git}
: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
-git-fetch-script "$merge_repo" "$merge_head"
+git-fetch-script "$merge_repo" "$merge_head"
|| exit 1
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \