projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] cvs2git and file permissions
[git.git]
/
git-pull-script
diff --git
a/git-pull-script
b/git-pull-script
index
a4ca97c
..
dbef56c
100755
(executable)
--- a/
git-pull-script
+++ b/
git-pull-script
@@
-6,9
+6,7
@@
merge_name=$(echo "$1" | sed 's:\.git/*$::')
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