Compare commits
	
		
			No commits in common. "67904896a2797276b82202516f12e23550bd0cd3" and "e2467646d8bb6f3207a684532c224b04888b6515" have entirely different histories.
		
	
	
		
			67904896a2
			...
			e2467646d8
		
	
		
					 2 changed files with 1 additions and 11 deletions
				
			
		| 
						 | 
				
			
			@ -44,7 +44,6 @@
 | 
			
		|||
    extraConfig = {
 | 
			
		||||
      credential.helper = "cache";
 | 
			
		||||
      push.default = "simple";
 | 
			
		||||
      push.forceIfIncludes = true;  # avoid accidental force overrides when remote is autofetched in background
 | 
			
		||||
      init.defaultBranch = "mainline";
 | 
			
		||||
      diff.tool = "vimdiff";
 | 
			
		||||
      merge.tool = "vimdiff";
 | 
			
		||||
| 
						 | 
				
			
			@ -76,16 +75,6 @@
 | 
			
		|||
      };
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
  programs.lazygit = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
    settings = {
 | 
			
		||||
      git = {
 | 
			
		||||
        autoFetch = false;
 | 
			
		||||
        mainBranches = ["main" "master" "mainline"];
 | 
			
		||||
      };
 | 
			
		||||
      update.method = "never";
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  # shell config
 | 
			
		||||
  programs.zsh = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -106,6 +106,7 @@ let
 | 
			
		|||
      ripgrep
 | 
			
		||||
      fd
 | 
			
		||||
      gitui
 | 
			
		||||
      lazygit
 | 
			
		||||
      pre-commit
 | 
			
		||||
      scriv
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue