various fixes, mostly for etiona

[distro-setup] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index f1c201968c14fd77be7c25125bbf09063df01d19..839cb5f57c76cdb66b236707223779f5b5827081 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,7 @@
 [user]
 name = Ian Kelling
 email = iank@fsf.org
+#email = ian@iankelling.org
 [alias]
 # Always use the git lg alias instead of git log.  It's too easy to get
 # confused by not seeing branches in git log output.
@@ -9,6 +10,7 @@ co = checkout
 s = status
 ci = commit
 lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
+dt = difftool
 
 [core]
 excludesfile = ~/.gitignore_global
@@ -24,6 +26,11 @@ helper = cache
 [diff]
 ignoreSubmodules = dirty
 tool = meld
+# on git pull of coreboot:
+# warning: inexact rename detection was skipped due to too many files.
+# warning: you may want to set your diff.renameLimit variable to at least 3694 and retry the command.
+renameLimit = 50000
+renames = copy
 
 [gitreview]
 username = iank