mirror of
https://github.com/srid/nixos-config.git
synced 2025-12-26 23:14:57 +08:00
git config
This commit is contained in:
parent
b145a2882a
commit
fa81a0fafe
1 changed files with 7 additions and 0 deletions
|
|
@ -17,6 +17,13 @@
|
|||
# p = "pull --rebase";
|
||||
pu = "push";
|
||||
};
|
||||
iniContent = {
|
||||
# Branch with most recent change comes first
|
||||
branch.sort = "-committerdate";
|
||||
# Remember and auto-resolve merge conflicts
|
||||
# https://git-scm.com/book/en/v2/Git-Tools-Rerere
|
||||
rerere.enabled = true;
|
||||
};
|
||||
ignores = [ "*~" "*.swp" ];
|
||||
delta = {
|
||||
enable = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue