From a62385ab8d46ffe68c589d4e90788e6bbea683e2 Mon Sep 17 00:00:00 2001 From: Holger Just Date: Thu, 6 Oct 2016 08:53:25 +0200 Subject: [PATCH] Use git push --force-with-lease instead of simple --force This acts as a tiny barrier for potentially bad decisions. See https://developer.atlassian.com/blog/2015/04/force-with-lease/ --- .gitconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index 58765a9..6f558ab 100644 --- a/.gitconfig +++ b/.gitconfig @@ -7,8 +7,8 @@ ci = commit cm = commit p = push - pf = push --force - fp = push --force + pf = push --force-with-lease + fp = push --force-with-lease su = submodule update --recursive --init addnw = !sh -c 'git diff -w --no-color "$@" | git apply --cached --ignore-whitespace' - [user]