[user]
- name = Ian Kelling
- email = ian@iankelling.org
+name = Ian Kelling
+email = iank@fsf.org
+#email = ian@iankelling.org
[alias]
- co = checkout
- s = status
- ci = commit
- lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
+# 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.
+lg = log --graph --decorate
+co = checkout
+s = status
+ci = commit
+lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
+dt = difftool
+
[core]
- excludesfile = /home/ian/.gitignore_global
-[github]
- user = ian-kelling
- token = d2dc0c5c6fef5378cc896a617e53c1a9
+excludesfile = ~/.gitignore_global
[credential]
- helper = cache
+helper = cache
- # new option, but not available yet on debian wheezy
- # [push]
+# new option, but not available yet on debian wheezy
+# [push]
# default = simple
# based on ghc advice,
# https://ghc.haskell.org/trac/ghc/wiki/Building/GettingTheSources
[diff]
- ignoreSubmodules = dirty
- tool = meld
+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
-# this is for newer git version. Doesn't work for ubuntu 12.04's version
-#[push]
-# default = simple
+username = iank
+remote = origin
[color]
- ui = auto
- status = auto
- branch = auto
- interactive = auto
- diff = auto
+ui = auto
+status = auto
+branch = auto
+interactive = auto
+diff = auto
# for hooks. http://stackoverflow.com/questions/2293498/git-commit-hooks-global-settings
[init]
- templatedir = ~/.git_template
+templatedir = ~/.git_template
[difftool]
- tool = meld
- prompt = false
+tool = meld
+prompt = false
[format]
+# This seemed like a good idea, but it broke interactive rebase, so disabled.
# for format-patch, use --base=auto. This means we need to do
-# git branch --set-upstream-to
- useAutoBase = true
+# git branch --set-upstream-to, but that should be done automatically
+# based on other settings.
+# useAutoBase = true
[branch]
+# Disabled as this was to be used with useAutoBase, which didn't work as expected.
# sets local branches to have the same remote tracking branch.
# This allows the useAutoBase setting to work without having to
# setup the branch specially with
# git branch --set-upstream-to origin/my_branch
# or git checkout -b my-branch origin/whatever
- autoSetupMerge = always
- # git pull always does rebase by default
- autoSetupRebase = always
+# autoSetupMerge = always
+
+# git pull always does rebase by default
+autoSetupRebase = always
+[push]
+default = simple