aboutsummaryrefslogtreecommitdiff
path: root/files/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'files/.gitconfig')
-rw-r--r--files/.gitconfig2
1 files changed, 2 insertions, 0 deletions
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]