opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Changes after working Scott Chacon's FOSDEM talk

Browse source 
- https://blog.gitbutler.com/fosdem-git-talk
- https://www.youtube.com/watch?v=aolI_Rz0ZqY
This commit is contained in:
Oliver Davies 2024-03-01 23:26:08 +00:00
parent 7640e6e12b
commit d2e1024897
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/shared/modules/git.nix
View file

@ -39,6 +39,7 @@
assume = "update-index --assume-unchanged"; assume = "update-index --assume-unchanged";
assumed = "!git ls-files -v | grep '^[hsmrck?]' | cut -c 3-"; assumed = "!git ls-files -v | grep '^[hsmrck?]' | cut -c 3-";
b = "branch"; b = "branch";
blame = "blame -w -C -C -C";
browse = "!gh repo view --web"; browse = "!gh repo view --web";
ca = "commit --amend --verbose"; ca = "commit --amend --verbose";
car = "commit --amend --no-edit"; car = "commit --amend --no-edit";
@ -73,6 +74,7 @@
slap = "log --oneline --decorate --graph --all"; slap = "log --oneline --decorate --graph --all";
slp = "log --oneline --decorate"; slp = "log --oneline --decorate";
staged = "diff --staged"; staged = "diff --staged";
stash = "stash --all";
unassume = "update-index --no-assume-unchanged"; unassume = "update-index --no-assume-unchanged";
uncommit = "reset --soft HEAD^"; uncommit = "reset --soft HEAD^";
unstage = "reset"; unstage = "reset";
@ -85,9 +87,11 @@
branch = { branch = {
autosetupmerge = true; autosetupmerge = true;
autosetuprebase = "always"; autosetuprebase = "always";
sort = "-committerdate";
}; };
checkout.defaultRemote = "origin"; checkout.defaultRemote = "origin";
color.ui = true; color.ui = true;
column.ui = "auto";
commit = {template = "~/.gitmessage";}; commit = {template = "~/.gitmessage";};
core = { core = {
editor = "nvim"; editor = "nvim";
@ -97,9 +101,14 @@
delta.line-numbers = true; delta.line-numbers = true;
diff.tool = "vimdiff"; diff.tool = "vimdiff";
fetch.prune = true; fetch.prune = true;
gpg.format = "ssh";
grep.lineNumber = true; grep.lineNumber = true;
help.autocorrect = "1"; help.autocorrect = "1";
init.defaultBranch = "main"; init.defaultBranch = "main";
maintenance = {
auto = false;
strategy = "incremental";
};
merge.ff = "only"; merge.ff = "only";
push = { push = {
autoSetupRemote = true; autoSetupRemote = true;
@ -113,6 +122,7 @@
autosquash = true; autosquash = true;
autostash = true; autostash = true;
}; };
user.signingkey = "~/.ssh/id_rsa.pub";
}; };
}; };