home: git: include local configuration properly
All checks were successful
ci/woodpecker/push/check Pipeline was successful
All checks were successful
ci/woodpecker/push/check Pipeline was successful
Using `includes` ensures that the local configuration is included at the end of the configuration file.
This commit is contained in:
parent
8f5be69a4e
commit
1237ef4174
1 changed files with 5 additions and 6 deletions
|
|
@ -123,11 +123,6 @@ in
|
||||||
defaultBranch = "main";
|
defaultBranch = "main";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Local configuration, not-versioned
|
|
||||||
include = {
|
|
||||||
path = "config.local";
|
|
||||||
};
|
|
||||||
|
|
||||||
merge = {
|
merge = {
|
||||||
conflictStyle = "zdiff3";
|
conflictStyle = "zdiff3";
|
||||||
};
|
};
|
||||||
|
|
@ -167,8 +162,8 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Multiple identities
|
|
||||||
includes = [
|
includes = [
|
||||||
|
# Multiple identities
|
||||||
{
|
{
|
||||||
condition = "gitdir:~/git/EPITA/";
|
condition = "gitdir:~/git/EPITA/";
|
||||||
contents = {
|
contents = {
|
||||||
|
|
@ -187,6 +182,10 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
# Local configuration, not-versioned
|
||||||
|
{
|
||||||
|
path = "config.local";
|
||||||
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
ignores =
|
ignores =
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue