summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-28 17:15:10 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-28 17:15:10 (GMT)
commit5571be75ebb6c8a1f88b3897d9631279106d8e0f (patch)
treea86ca57152212a8389234b63dc8c13303cf12df7
parenta69d09436687746a898f86f32c180083f323b616 (diff)
downloadgit-5571be75ebb6c8a1f88b3897d9631279106d8e0f.zip
git-5571be75ebb6c8a1f88b3897d9631279106d8e0f.tar.gz
git-5571be75ebb6c8a1f88b3897d9631279106d8e0f.tar.bz2
Duh. Fix transposed characters in git-pull-script
I'd stupidly only tested the non-branch-name version.
-rwxr-xr-xgit-pull-script2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull-script b/git-pull-script
index 4ec12bd..961edc4 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -12,7 +12,7 @@ fi
if [ "$2" ]
then
merge_name="$type '$2' of $merge_name"
- merge_head="refs/{$type}s/$2"
+ merge_head="refs/${type}s/$2"
fi
: ${GIT_DIR=.git}