oysteikt/nix-dotfiles
1
1
Fork 0
Code Issues 138 Pull Requests Activity

home/git: add reset-to-upstream alias, sort aliases

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2025-02-24 10:45:23 +01:00
parent d91827be7e
commit 2ab3e40dbd
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
home/programs/git/default.nix
View File

@@ -47,17 +47,18 @@ in
aliases = { aliases = {
aliases = "!git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'"; 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"; authors = "shortlog --summary --numbered --email";
si = "switch-interactive"; delete-merged = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d";
ff = "fixup-fixup"; ff = "fixup-fixup";
fi = "fixup-interactive"; fi = "fixup-interactive";
rf = "rebase-fixups"; forcepush = "push --force-with-lease --force-if-includes";
pp = "post-pr";
subs = "submodule update --init --recursive";
rebase-author = "rebase -i -x \"git commit --amend --reset-author -CHEAD\"";
git = "!git"; 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 } // (let
c = c: s: "%C(${c})${s}%C(reset)"; c = c: s: "%C(${c})${s}%C(reset)";
in { in {