diff options
Diffstat (limited to 'files')
| -rw-r--r-- | files/.gitconfig | 2 | ||||
| m--------- | files/.zsh/zsh-completions | 0 |
2 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] diff --git a/files/.zsh/zsh-completions b/files/.zsh/zsh-completions -Subproject a09284a73443d4a0288c5a984c5adb5f55ace52 +Subproject 31e551b4231f76d5b015a6dcaa11e416af7d869 |