aliases

@@ -139,8 +139,8 @@ alias grbc="grb --continue"
 alias grbsk="grb --skip"
 alias grbsh="grb --show-current"
 alias grbom="git rebase \"origin/\$(git defbranch)\""
-gfrb() { remote="${1%%/*}"; git fetch "$remote" && git rebase "$@"; }
+gfrb() { remote="${1%/*}"; git fetch "$remote" && git rebase "$@"; }
-gfrbi() { remote="${1%%/*}"; git fetch "$remote" && git rebase -i "$@"; }
+gfrbi() { remote="${1%/*}"; git fetch "$remote" && git rebase -i "$@"; }
 
 alias gam="git am"
 alias gama="git am --abort"

git/config

@@ -37,23 +37,8 @@
 	count = !echo $(pwd) && git rev-list HEAD --count
 	unpushed = !git log --oneline @{u}..HEAD
 	leaders = !git shortlog -s -n --all --no-merges
-	defbranch = "!defbranch() { \
+	defbranch = !git symbolic-ref refs/remotes/origin/HEAD | sed \"s@^refs/remotes/origin/@@\"
-		r=\"${1:-origin}\"; \
+	cleanmerged = !git branch --merged \"origin/$(git defbranch)\" | grep -ve \"^\\\\*\" -e \"^. $(git defbranch)$\" | xargs -r git branch -d
-		{ \
-			git symbolic-ref \"refs/remotes/$r/HEAD\" || { \
-				git remote set-head \"$r\" -a >&2 && \
-				git symbolic-ref \"refs/remotes/$r/HEAD\"; \
-			}; \
-		} 2>/dev/null \
-			| sed \"s@^refs/remotes/$r/@@\"; \
-	}; defbranch"
-	cleanmerged = "!cleanmerged() { \
-		r=\"${1:-origin}\"; \
-		b=\"${2:-$(git defbranch \"$r\")}\"; \
-		git branch --merged \"$r/$b\" | \
-			grep -ve \"^\\\\*\" -e \"^. $b$\" | \
-			xargs -r git branch -d; \
-	}; cleanmerged"
 [advice]
 	statusHints = false
 	pushUpdateRejected = false