From 44686c0d3ea022f1c534ae0961a1d6d82574fcd4 Mon Sep 17 00:00:00 2001 From: Li Tang Date: Wed, 20 May 2026 20:56:32 +0800 Subject: [PATCH] feat: git pull with rebase Signed-off-by: Li Tang --- .zshrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index fe0c4d7..1ebce38 100644 --- a/.zshrc +++ b/.zshrc @@ -323,7 +323,7 @@ function git_clean() { git checkout "$base_branch" && \ git config pull.rebase false && \ - git pull && \ + git pull --rebase && \ 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 @@ -515,3 +515,7 @@ function copilot_local { # Kiro CLI post block. Keep at the bottom of this file. # [[ -f "${HOME}/Library/Application Support/kiro-cli/shell/zshrc.post.zsh" ]] && builtin source "${HOME}/Library/Application Support/kiro-cli/shell/zshrc.post.zsh" + + +# Added by Antigravity CLI installer +export PATH="/Users/d0zingcat/.local/bin:$PATH"