diff --git a/.zshrc b/.zshrc index 1ebce38..271e13b 100644 --- a/.zshrc +++ b/.zshrc @@ -322,8 +322,7 @@ function git_clean() { fi git checkout "$base_branch" && \ - git config pull.rebase false && \ - git pull --rebase && \ + git pull && \ git branch --merged | grep -v " $base_branch$" | xargs git branch -d 2>/dev/null; \ git branch -vv | awk '/: gone]/{print $1}' | xargs git branch -D 2>/dev/null; \ git worktree prune --verbose diff --git a/git/config b/git/config index 9be7591..296f724 100644 --- a/git/config +++ b/git/config @@ -1,6 +1,9 @@ [init] defaultBranch = main +[pull] + rebase = true + [user] name = YOUR_NAME signingkey = YOUR_SSH_SIGNING_KEY