summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d6771bd)
raw | patch | inline | side by side (parent: d6771bd)
author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Tue, 28 Jun 2005 03:10:32 +0000 (20:10 -0700) | ||
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Tue, 28 Jun 2005 03:10:32 +0000 (20:10 -0700) |
git-pull-script | patch | blob | history |
diff --git a/git-pull-script b/git-pull-script
index 90ee0f322d8c569a5b02b3be1548eb990b4263c9..4ec12bd887e0af896fdfaa1d30219d3e8ff070e8 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
merge_name=$(echo "$1" | sed 's:\.git/*$::')
merge_head=HEAD
+type=head
+if [ "$2" = "tag" ]; then
+ type=tag
+ shift
+fi
if [ "$2" ]
then
- merge_name="'$2' branch of $merge_name"
- merge_head="refs/heads/$2"
+ merge_name="$type '$2' of $merge_name"
+ merge_head="refs/{$type}s/$2"
fi
: ${GIT_DIR=.git}