From 28779f60ea89e4e16cdd88f7a72c2ee678ed53ca Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Wed, 9 Aug 2023 12:09:54 +0800 Subject: [PATCH] feat: git config --- home/base/server/git.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/home/base/server/git.nix b/home/base/server/git.nix index a307e7e3..25fa9910 100644 --- a/home/base/server/git.nix +++ b/home/base/server/git.nix @@ -54,10 +54,15 @@ # signByDefault = true; # }; + # A syntax-highlighting pager in Rust(2019 ~ Now) delta = { enable = true; options = { - features = "side-by-side"; + diff-so-fancy = true; + line-numbers = true; + true-color = "always"; + # features => named groups of settings, used to keep related settings organized + # features = ""; }; }; @@ -71,8 +76,17 @@ cm = "commit -m"; # commit via `git cm ` ca = "commit -am"; # commit all changes via `git ca ` dc = "diff --cached"; + amend = "commit --amend -m"; # amend commit message via `git amend ` unstage = "reset HEAD --"; # unstage file via `git unstage ` + merged = "branch --merged"; # list merged(into HEAD) branches via `git merged` + unmerged = "branch --no-merged"; # list unmerged(into HEAD) branches via `git unmerged` + nonexist = "remote prune origin --dry-run"; # list non-exist(remote) branches via `git nonexist` + + # delete merged branches except master & dev & staging + delmerged = "! git branch --merged | grep -v '(^\*|main|master|dev|staging)' | xargs git branch -d"; + # delete non-exist(remote) branches + delnonexist = "remote prune origin"; # aliases for submodule update = "submodule update --init --recursive";