Compare commits

..

No commits in common. "95062daba7532820052e94dee279e9d70cc0e493" and "b19fb51e6e4475d1b364260d0619919cb68f8e6f" have entirely different histories.

View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}:{
programs.git = {
enable = true;
package = pkgs.gitSVN;
@ -18,27 +17,6 @@
signByDefault = true;
};
extraConfig = {
"branch" = {
sort = "-committerdate";
};
"column" = {
ui = "auto";
};
"commit" = {
verbose = "true";
};
"diff" = {
algorithm = "histogram";
colorMoved = "plain";
mnemonicPrefix = "true";
renames = "true";
};
"tag" = {
sort = "version:refname";
};
"help" = {
autocorrect = "promt";
};
"core" = {
pager = "less -F -X";
};
@ -48,42 +26,29 @@
"pull" = {
rebase = "true";
};
"rebase" = {
autoSquash = "true";
autoStash = "true";
updateRefs = "true";
};
"fetch" = {
all = "true";
prune = "true";
pruneTags = "true";
};
"push" = {
autoSetupRemote = "true";
default = "simple";
followTags = "true";
};
};
aliases = {
# checkout-pull-request from GitHub
cpr = "!f() { git fetch origin refs/pull/$1/head && git checkout FETCH_HEAD; }; f";
};
includes = [
{
condition = "gitdir:~/denic/";
contents = {
user = {
email = "breidenstein@denic.de";
name = "Felix Breidenstein";
};
commit = {
gpgSign = false;
};
includes = [{
condition = "gitdir:~/denic/";
contents = {
user = {
email = "breidenstein@denic.de";
name = "Felix Breidenstein";
};
}
commit = {
gpgSign = false;
};
};
}
];
};
}