feat: post-merge新增pull后的分支检测提示

WGrape · Sep 17, 2022 · fed524f · fed524f
1 parent ee3ffde
commit fed524f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -106,7 +106,7 @@ posture sethook
 
 <details>
   <summary>查看使用示例</summary>
-<img src="https://user-images.githubusercontent.com/35942268/190092067-4de64421-39c0-45fb-be53-b2cace7a5d66.png" width="500">
+  <img width="800" src="https://user-images.githubusercontent.com/35942268/190868050-13348f58-5abe-4da1-b714-f1a3784a6f0c.png">
 </details>
 
 ### <span id="323">(3) commit钩子</span>

diff --git a/hooks/post-merge b/hooks/post-merge
@@ -7,3 +7,5 @@ fi
 
 printLogo
 echo "温馨提示: 请注意是否拉取了正确的分支 (Warm tips: Please pull the correct branch)"
+echo "> 合并成功 (merge successfully)"
+echo "> 请检查是否合并了正确分支 (please check the pulled branch is correct): \033[33m" $(git reflog -1) "\033[0m"