iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mostly fixes for new error handling
[distro-setup]
/
.gitconfig
diff --git
a/.gitconfig
b/.gitconfig
index c4fd69d976235b715af0b62e2448226bdead8708..839cb5f57c76cdb66b236707223779f5b5827081 100644
(file)
--- a/
.gitconfig
+++ b/
.gitconfig
@@
-1,6
+1,7
@@
[user]
name = Ian Kelling
email = iank@fsf.org
[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.
[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,12
+10,10
@@
co = checkout
s = status
ci = commit
lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
s = status
ci = commit
lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
+dt = difftool
[core]
excludesfile = ~/.gitignore_global
[core]
excludesfile = ~/.gitignore_global
-[github]
-user = ian-kelling
-token = d2dc0c5c6fef5378cc896a617e53c1a9
[credential]
helper = cache
[credential]
helper = cache
@@
-27,13
+26,15
@@
helper = cache
[diff]
ignoreSubmodules = dirty
tool = meld
[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
remote = origin
[gitreview]
username = iank
remote = origin
-# this is for newer git version. Doesn't work for ubuntu 12.04's version
-#[push]
-# default = simple
[color]
ui = auto
status = auto
[color]
ui = auto
status = auto