X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=246a3a4b373dba87877204c90c9f808dfa93c45c;hb=08bb03e4754cf285c0fe49d22d2b8ce13d7609a2;hp=38331a861106c63bf5f421dbe03f4aafe949812e;hpb=7ecee3314fdafd8015fd14bfb76ae4b601acc25e;p=git.git diff --git a/git-pull.sh b/git-pull.sh index 38331a861..246a3a4b3 100755 --- 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= 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