add .gitignore and switch to rebase strategy
This commit is contained in:
parent
20f4850036
commit
1b8fcb1887
4 changed files with 6 additions and 3 deletions
4
.gitignore
vendored
Normal file
4
.gitignore
vendored
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
# output of nixos-rebuild build or deploy-rs
|
||||||
|
result
|
||||||
|
|
||||||
|
.direnv
|
|
@ -34,7 +34,7 @@ in
|
||||||
defaultBranch = "main";
|
defaultBranch = "main";
|
||||||
};
|
};
|
||||||
pull = {
|
pull = {
|
||||||
rebase = false;
|
rebase = true;
|
||||||
};
|
};
|
||||||
push = {
|
push = {
|
||||||
autoSetupRemote = true;
|
autoSetupRemote = true;
|
||||||
|
|
|
@ -39,7 +39,7 @@ in
|
||||||
defaultBranch = "main";
|
defaultBranch = "main";
|
||||||
};
|
};
|
||||||
pull = {
|
pull = {
|
||||||
rebase = false;
|
rebase = true;
|
||||||
};
|
};
|
||||||
push = {
|
push = {
|
||||||
autoSetupRemote = true;
|
autoSetupRemote = true;
|
||||||
|
|
1
result
1
result
|
@ -1 +0,0 @@
|
||||||
/nix/store/5bn24v1m3gsjr96fj9h2kavaj67lxh5q-nixos-24.05.20240410.1042fd8-x86_64-linux.iso
|
|
Loading…
Add table
Add a link
Reference in a new issue