git emerge: update to use force with lease

thiagowfx · Jan 1, 2025 · 611c55a · 611c55a
1 parent 8704f46
commit 611c55a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git/.gitconfig b/git/.gitconfig
@@ -20,7 +20,7 @@
 	cp = cherry-pick
 	dc = diff --cached
 	desc = commit --allow-empty -n
-	emerge = !git add -A . && git amend -n && git pushm -f
+	emerge = !git add -A . && git amend -n && git pushm --force-with-lease
 	nb = switch --create
 	nbt = !git nb "thiagowfx/$(shuf -n1 /usr/share/dict/words | tr '[:upper:]' '[:lower:]')"
 	pullm = !git pull $(git remote | head -1) $(git branch --show-current):$(git branch --show-current)