projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Clean up git-diff-tree 'header' generation
[git.git]
/
git-pull-script
diff --git
a/git-pull-script
b/git-pull-script
index
dbef56c
..
90ee0f3
100755
(executable)
--- a/
git-pull-script
+++ b/
git-pull-script
@@
-17,5
+17,5
@@
git-fetch-script "$merge_repo" "$merge_head" || exit 1
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
- "$(cat "$GIT_DIR"/
MERGE
_HEAD)" \
+ "$(cat "$GIT_DIR"/
FETCH
_HEAD)" \
"$merge_name"