From 287e74f9bdba0ab704218cf2de87fafe6637af5e Mon Sep 17 00:00:00 2001
From: Dict Xiong <me@beardic.cn>
Date: Sat, 30 Jul 2022 13:53:26 +0800
Subject: [PATCH] new force-update

---
 .zshrc2 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.zshrc2 b/.zshrc2
index 4b405e6..2766ccb 100644
--- a/.zshrc2
+++ b/.zshrc2
@@ -81,7 +81,13 @@ dfs()
 {
     case $1 in
         update ) $DOTFILES/update.sh ;;
-        force-update ) (cd "$DOTFILES" && git fetch --all && git reset --hard origin/main && git pull) ;;
+        force-update ) (
+            cd "$DOTFILES" 
+            git fetch --all
+            ref=$(__git_prompt_git symbolic-ref --short HEAD 2> /dev/null)  || ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null)  || return 0
+            for b in $(git for-each-ref refs/heads --format='%(refname)') ; do git checkout ${b#refs/heads/} ; git pull --ff-only ; done
+            git checkout $ref)
+            ;;
         version ) (cd "$DOTFILES" && git rev-parse HEAD) ;;
         reset  )
             antigen reset 1> /dev/null