Merge branch 'cc/reset-keep'

diff --git a/git-pull.sh b/git-pull.sh
index d45b50cf4783912cedc4b7764a609ea9b4176969..1a4729f7bb29205fb7bc251887dcd4f5237f1659 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -41,7 +41,7 @@ strategy_args= diffstat= no_commit= squash= no_ff= ff_only=
 log_arg= verbosity= progress=
 merge_args=
 curr_branch=$(git symbolic-ref -q HEAD)
-curr_branch_short=$(echo "$curr_branch" | sed "s|refs/heads/||")
+curr_branch_short="${curr_branch#refs/heads/}"
 rebase=$(git config --bool branch.$curr_branch_short.rebase)
 while :
 do