feat: add packer snapshot

2022-09-11 20:50:20 +08:00
parent 0c43a07d46
commit b5a302a22f
5 changed files with 14 additions and 4 deletions
@@ -15,7 +15,7 @@
    br = branch
    pl = pull
    pt = push origin --tags
-    merge2 = "!f() { git checkout $1 && git merge $2 && git checkout -; }; f"
+    merge2 = !sh -c '_CURRENT_BRANCH=$(git symbolic-ref --short HEAD) && git checkout $1 && git merge $_CURRENT_BRANCH && git checkout $_CURRENT_BRANCH' -
    bg = "!f() { git branch | grep $1; }; f"
    delbr = "!f(){ git branch -D $(git branch | grep \"\b$1\"); };f"
    can = commit --amend --no-edit