~diego/dotfiles

516a4f319a551c1bd4d2e7be7268a921d5065520 — Diego Vicente 11 months ago 08d071c
Set the default git pull strategy to fast-forward
1 files changed, 7 insertions(+), 0 deletions(-)

M home-modules/cli.nix
M home-modules/cli.nix => home-modules/cli.nix +7 -0
@@ 30,6 30,13 @@
    enable = true;
    userName = userName;
    userEmail = userEmail;
    extraConfig = {
      # Only fast-forward by default. That way, git will push only if there are
      # no issues; otherwise we need to use one of:
      #   $ git pull --rebase    # to rebase when pulling
      #   $ git pull --ff        # to create a merge commit
      pull.ff = "only";
    };
  };

  # Define ZSH as the default shell and configure some basic options like the