Git: Cleanup
This commit is contained in:
		
							
								
								
									
										2
									
								
								git/.gitattributes
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								git/.gitattributes
									
									
									
									
										vendored
									
									
								
							@@ -1 +1,3 @@
 | 
			
		||||
*.* diff=delta
 | 
			
		||||
*.yaml diff=dyff
 | 
			
		||||
*.yml diff=dyff
 | 
			
		||||
 
 | 
			
		||||
@@ -21,7 +21,7 @@
 | 
			
		||||
    rebase = true
 | 
			
		||||
[push]
 | 
			
		||||
    autoSetupRemote = true
 | 
			
		||||
	default = current
 | 
			
		||||
    default = current
 | 
			
		||||
[interactive]
 | 
			
		||||
    diffFilter = delta --color-only
 | 
			
		||||
[delta]
 | 
			
		||||
@@ -32,14 +32,12 @@
 | 
			
		||||
    file-style = bold yellow ul
 | 
			
		||||
    file-decoration-style = none
 | 
			
		||||
[hub]
 | 
			
		||||
	protocol = https
 | 
			
		||||
    protocol = https
 | 
			
		||||
[credential]
 | 
			
		||||
	helper = store
 | 
			
		||||
    helper = store
 | 
			
		||||
[init]
 | 
			
		||||
	defaultBranch = main
 | 
			
		||||
    defaultBranch = main
 | 
			
		||||
[diff "dyff"]
 | 
			
		||||
	command = "dyff_between() { dyff --color on between --omit-header \"$2\" \"$5\"; }; dyff_between"
 | 
			
		||||
    command = "dyff_between() { dyff --color on between --omit-header \"$2\" \"$5\"; }; dyff_between"
 | 
			
		||||
[merge]
 | 
			
		||||
	tool = smerge
 | 
			
		||||
[safe]
 | 
			
		||||
	directory = /opt/flutter
 | 
			
		||||
    tool = smerge
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user