git.lirion.de

Of git, get, and gud

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormail_redacted_for_web 2025-03-15 04:49:26 +0100
committermail_redacted_for_web 2025-03-15 04:49:26 +0100
commit001b9cb2ccc045549ddcef8f08ad436582185fb6 (patch)
treea3d1506fc5a87f339c397ee5bded014af39cc7ee
parent653bc8946e1a8ce660a5bdeeac177b72023fef9d (diff)
downloaddotfiles-001b9cb2ccc045549ddcef8f08ad436582185fb6.tar.bz2
New aliases
-rw-r--r--.bash/aliases.bash9
-rw-r--r--.gitconfig2
2 files changed, 10 insertions, 1 deletions
diff --git a/.bash/aliases.bash b/.bash/aliases.bash
index 090a572..85b8737 100644
--- a/.bash/aliases.bash
+++ b/.bash/aliases.bash
@@ -105,7 +105,9 @@ xstat() {
done
}
# ----- PACKAGE MANAGERS ----- #
-if [ -x "/usr/bin/pikaur" ];then
+if [ -x "/usr/bin/paru" ];then
+ alias pkgclean="paru --noconfirm -Sc"
+elif [ -x "/usr/bin/pikaur" ];then
alias pkgclean="pikaur --noconfirm -Sc"
elif [ -x "/usr/bin/pacman" ];then
alias pkgclean="/usr/bin/sudo /usr/bin/pacman --noconfirm -Sc"
@@ -200,6 +202,11 @@ if command -v podman >/dev/null;then
alias pnd="podman network disconnect"
alias ppd="podman pod stop"
fi
+# ----- PUPPET + RUBY ----- #
+# ...yeah, I'm mostly doing ruby stuff for Puppet, erm I mean
+# OpenVox (now that Perforce have turned the Puppet world to a burning heap of garbage)
+alias bake="bundle exec rake"
+# ----- OTHER STUFF ----- #
for cmmd in batcat bat; do
if command -v "$cmmd" > /dev/null; then
# shellcheck disable=SC2139
diff --git a/.gitconfig b/.gitconfig
index 16a3504..7f66606 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -67,6 +67,8 @@
sls = "!git shortlog -s | cut -f1 | spark"
gl-mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -"
cps = cherry-pick -S
+ force = push --force-with-lease
+ pf = push --force-with-lease
[push]
default = simple
[pretty]