diff --git a/rules/git.toml b/rules/git.toml
index d268e24..1b9cd73 100644
--- a/rules/git.toml
+++ b/rules/git.toml
@@ -69,7 +69,6 @@ replace,
 pattern = [
 	"did not match any file"
 ]
-# alternatively `git checkout {{typo[2]({{shell(git branch | sed 's/^*//')}})}}`
 suggest = [
 '''
 #[cmd_contains(checkout)]
@@ -109,3 +108,28 @@ suggest = [
 #[cmd_contains(branch)]
 git checkout {{command[2]}} '''
 ]
+
+[[match_err]]
+pattern = [
+	"updates were rejected"
+]
+suggest = [
+'''
+#[cmd_contains(push)]
+git pull && \
+{{command}} ''',
+'''
+#[cmd_contains(push)]
+{{command}} --force '''
+]
+
+[[match_err]]
+pattern = [
+	"you have unstaged changes"
+]
+suggest = [
+'''
+git stash && \
+{{command}} && \
+git stash pop '''
+]