Merge branch 'maint'

gitster · gitster · commit bcef9b6327a7 · 2011-03-30T19:33:53.000-07:00
* maint:
  parse-remote: typofix
diff --git a/git-parse-remote.sh b/git-parse-remote.sh
@@ -6,7 +6,7 @@ GIT_DIR=$(git rev-parse -q --git-dir) || :;
 
 get_default_remote () {
 	curr_branch=$(git symbolic-ref -q HEAD)
-	curr_branch="${cur_branch#refs/heads/}"
+	curr_branch="${curr_branch#refs/heads/}"
 	origin=$(git config --get "branch.$curr_branch.remote")
 	echo ${origin:-origin}
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ GIT_DIR=$(git rev-parse -q --git-dir) \|\| :;`
`6`	`6`
`7`	`7`	`get_default_remote () {`
`8`	`8`	`curr_branch=$(git symbolic-ref -q HEAD)`
`9`		`- curr_branch="${cur_branch#refs/heads/}"`
	`9`	`+ curr_branch="${curr_branch#refs/heads/}"`
`10`	`10`	`origin=$(git config --get "branch.$curr_branch.remote")`
`11`	`11`	`echo ${origin:-origin}`
`12`	`12`	`}`