Alexander Kobjolke
579901e786
- pull via rebase by default - use three-way-diff - recurse into submodules
56 lines
1.4 KiB
Nix
56 lines
1.4 KiB
Nix
{ config, lib, pkgs, ... }:
|
|
|
|
{
|
|
programs.git = {
|
|
enable = true;
|
|
lfs.enable = true;
|
|
ignores = [ "*~" "*.swp" "result" "dist-newstyle" ];
|
|
signing = {
|
|
key = "41A6D13FECA21280";
|
|
signByDefault = false;
|
|
};
|
|
delta = { enable = true; };
|
|
# TODO create option for my own account meta data
|
|
userEmail = "me@failco.de";
|
|
userName = "Alexander Kobjolke";
|
|
|
|
extraConfig = {
|
|
pull = { rebase = true; };
|
|
merge = { conflictstyle = "diff3"; };
|
|
submodule = { recurse = true; };
|
|
};
|
|
|
|
aliases = {
|
|
a = "add";
|
|
c = "commit";
|
|
ca = "commit --amend";
|
|
can = "commit --amend --no-edit";
|
|
cl = "clone";
|
|
cm = "commit -m";
|
|
co = "checkout";
|
|
cp = "cherry-pick";
|
|
cpx = "cherry-pick -x";
|
|
d = "diff";
|
|
f = "fetch";
|
|
fo = "fetch origin";
|
|
fu = "fetch upstream";
|
|
lol = "log --graph --decorate --pretty=oneline --abbrev-commit";
|
|
lola = "log --graph --decorate --pretty=oneline --abbrev-commit --all";
|
|
pl = "pull";
|
|
pr = "pull -r";
|
|
ps = "push";
|
|
psf = "push -f";
|
|
rb = "rebase";
|
|
rbi = "rebase -i";
|
|
r = "remote";
|
|
ra = "remote add";
|
|
rr = "remote rm";
|
|
rv = "remote -v";
|
|
rs = "remote show";
|
|
st = "status";
|
|
};
|
|
extraConfig = { init.defaultBranch = "main"; };
|
|
};
|
|
|
|
programs.git-cliff = { enable = true; };
|
|
}
|