projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] Update tags to record who made them
[git.git]
/
git-pull-script
diff --git
a/git-pull-script
b/git-pull-script
index
0ef6be3
..
8e309fc
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"