From f9a2b5229a4dd6d9cd392c57643124aeb7be15d6 Mon Sep 17 00:00:00 2001
From: Anton Bobov <anton@bobov.name>
Date: Wed, 25 Jan 2023 20:09:42 +0500
Subject: Update zsh-completion and git config

---
 files/.gitconfig | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'files/.gitconfig')

diff --git a/files/.gitconfig b/files/.gitconfig
index 120b464..0b2acc1 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -61,6 +61,7 @@
     sha = rev-parse --short
     addnw = !sh -c 'git diff --unified=0 --ignore-all-space --no-color "$@" | git apply --cached --ignore-whitespace --unidiff-zero -'
     branch-name = "!git rev-parse --abbrev-ref HEAD"
+    pushf = push --force-with-lease
     publish = "!git push -u origin $(git branch-name)"
     # https://datagrok.org/git/git-serve/
     quickserve="daemon --verbose --export-all --base-path=.git --reuseaddr --strict-paths .git/"
@@ -92,6 +93,7 @@
     sort = authordate
 [rebase]
     instructionFormat = %s [%an] {%ar}
+    autoStash = true
 [rerere]
     enabled = true
 [status]
-- 
cgit v1.2.3