@@ 10,6 10,8 @@ 
 	undo-hard = reset --hard origin/master
 [push]
 	default = matching
+	autoSetupRemote = true
+	followTags = true
 [sendemail]
 	smtpserver = /usr/bin/msmtp
 	smtpserveroption=-a

          
@@ 33,3 35,18 @@ 
 	fixes = Fixes: %h (\"%s\")
 	lineauthor = %C(auto)%h %C(auto,cyan)%ad %C(auto,magenta)%<(14,trunc)%an%C(auto)%d %C(auto,reset)%s%C(auto,cyan)%<(60,trunc) %(trailers:key=Acked-by,key=Reviewed-by,key=Tested-by,unfold,separator=%x2C )%C(auto,reset)
 	line = %C(auto)%h %C(auto,cyan)%ad %C(auto,magenta)%<(14,trunc)%an%C(auto)%d %C(auto,reset)%s%C(auto,cyan)
+[column]
+	ui = auto,row
+[tag]
+	sort = version:refname
+[init]
+	defaultBranch = main
+[diff]
+	algorithm = histogram
+	colorMoved = plain
+	mnemonicPrefix = true
+	renames = true
+[commit]
+	verbose = true
+[merge]
+	conflictstyle = zdiff3