From 75f0f0d3329e2f692373039e930b51cc9e668ae3 Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Wed, 6 Jul 2022 10:21:14 +0200 Subject: [PATCH] bin: pull before pushing --- .config/shell/functions | 4 ++-- .config/yadm/unignore | 1 + .local/bin/scripts/git-p | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.config/shell/functions b/.config/shell/functions index e24895b..cbaa29d 100644 --- a/.config/shell/functions +++ b/.config/shell/functions @@ -205,8 +205,8 @@ alias hedgedoc="tmux kill-session -t hedgedoc; builtin cd '$d4/dev/_forks/hedged alias rm='rm -I' del() { - # TODO create on current partition and clean on reboot via cron - trash=/tmp/thrash/ + # TODO use current partition and clean on reboot via cron + trash=/tmp/trash/ #mkdir $trash m "$@" $trash } diff --git a/.config/yadm/unignore b/.config/yadm/unignore index f47da36..9b5c31a 100644 --- a/.config/yadm/unignore +++ b/.config/yadm/unignore @@ -1,3 +1,4 @@ +$XDG_CONFIG_HOME/kitty $XDG_CONFIG_HOME/yadm $XDG_CONFIG_HOME/doom $XDG_CONFIG_HOME/git diff --git a/.local/bin/scripts/git-p b/.local/bin/scripts/git-p index d174b47..ae0eaf2 100755 --- a/.local/bin/scripts/git-p +++ b/.local/bin/scripts/git-p @@ -1,4 +1,5 @@ #!/bin/sh +git-l if git rev-parse @{upstream} >/dev/null 2>&1 then git push "$@" else git push --set-upstream "$@"