projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a69d094
)
Duh. Fix transposed characters in git-pull-script
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 17:15:10 +0000
(10:15 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 17:15:10 +0000
(10:15 -0700)
I'd stupidly only tested the non-branch-name version.
git-pull-script
patch
|
blob
|
history
diff --git
a/git-pull-script
b/git-pull-script
index 4ec12bd887e0af896fdfaa1d30219d3e8ff070e8..961edc481b96b0081c816520bc0c4e2cfe5a43f8 100755
(executable)
--- 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}