From 2ab3e40dbdbf90fed22ad240ac5ce9c6a69969ec Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 24 Feb 2025 10:45:23 +0100 Subject: [PATCH] home/git: add `reset-to-upstream` alias, sort aliases --- home/programs/git/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/home/programs/git/default.nix b/home/programs/git/default.nix index 26ea8b5..d807f70 100644 --- a/home/programs/git/default.nix +++ b/home/programs/git/default.nix @@ -47,17 +47,18 @@ in aliases = { aliases = "!git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'"; - delete-merged = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"; - forcepush = "push --force-with-lease --force-if-includes"; authors = "shortlog --summary --numbered --email"; - si = "switch-interactive"; + delete-merged = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"; ff = "fixup-fixup"; fi = "fixup-interactive"; - rf = "rebase-fixups"; - pp = "post-pr"; - subs = "submodule update --init --recursive"; - rebase-author = "rebase -i -x \"git commit --amend --reset-author -CHEAD\""; + forcepush = "push --force-with-lease --force-if-includes"; git = "!git"; + pp = "post-pr"; + rebase-author = "rebase -i -x \"git commit --amend --reset-author -CHEAD\""; + reset-to-upstream = "!git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\""; + rf = "rebase-fixups"; + si = "switch-interactive"; + subs = "submodule update --init --recursive"; } // (let c = c: s: "%C(${c})${s}%C(reset)"; in {