diff --git a/users/myuser/git.nix b/users/myuser/git.nix index 2999fda..314f582 100644 --- a/users/myuser/git.nix +++ b/users/myuser/git.nix @@ -12,6 +12,7 @@ merge.conflictstyle = "diff3"; mergetool.prompt = true; pull.rebase = true; + push.autoSetupRemote = true; }; aliases = { unstash = "stash pop"; @@ -30,5 +31,6 @@ ga = "git add"; gc = "git commit -v -S"; gca = "${gc} --amend"; + # TODO command to make new commit with old commit editmsg, beware worktrees have different path }; }