Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-daemon: actually remember the children we have outstanding
[gitweb.git]
/
git-pull-script
diff --git
a/git-pull-script
b/git-pull-script
index 0ef6be3547fe75b1758120161e1e3318b56ee6f4..8e309fc98b97659d08061b0e1f1e6d4f1e43fc32 100755
(executable)
--- a/
git-pull-script
+++ b/
git-pull-script
@@
-22,4
+22,4
@@
git-fetch-script "$merge_repo" "$merge_head" || exit 1
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
"$(cat "$GIT_DIR"/FETCH_HEAD)" \
- "$merge_name"
+ "
Merge
$merge_name"