iankelling.org Git - distro-setup/blob - .gitconfig

   1 [user]
   2 name = Ian Kelling
   3 email = iank@fsf.org
   4 #email = ian@iankelling.org
   5 [alias]
   6 # Always use the git lg alias instead of git log.  It's too easy to get
   7 # confused by not seeing branches in git log output.
   8 lg = log --graph --decorate
   9 co = checkout
  10 s = status
  11 ci = commit
  12 lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
  13 dt = difftool
  14
  15 [core]
  16 excludesfile = ~/.gitignore_global
  17 [credential]
  18 helper = cache
  19
  20 # new option, but not available yet on debian wheezy
  21 # [push]
  22 #       default = simple
  23
  24 # based on ghc advice,
  25 # https://ghc.haskell.org/trac/ghc/wiki/Building/GettingTheSources
  26 [diff]
  27 ignoreSubmodules = dirty
  28 tool = meld
  29 # on git pull of coreboot:
  30 # warning: inexact rename detection was skipped due to too many files.
  31 # warning: you may want to set your diff.renameLimit variable to at least 3694 and retry the command.
  32 renameLimit = 50000
  33 renames = copy
  34
  35 [gitreview]
  36 username = iank
  37 remote = origin
  38 [color]
  39 ui = auto
  40 status = auto
  41 branch = auto
  42 interactive = auto
  43 diff = auto
  44 # for hooks. http://stackoverflow.com/questions/2293498/git-commit-hooks-global-settings
  45 [init]
  46 templatedir = ~/.git_template
  47 [difftool]
  48 tool = meld
  49 prompt = false
  50 [format]
  51 # This seemed like a good idea, but it broke interactive rebase, so disabled.
  52 # for format-patch, use --base=auto. This means we need to do
  53 # git branch --set-upstream-to, but that should be done automatically
  54 # based on other settings.
  55 #       useAutoBase = true
  56 [branch]
  57 # Disabled as this was to be used with useAutoBase, which didn't work as expected.
  58 # sets local branches to have the same remote tracking branch.
  59 # This allows the useAutoBase setting to work without having to
  60 # setup the branch specially with
  61 # git branch --set-upstream-to origin/my_branch
  62 # or git checkout -b my-branch origin/whatever
  63 #       autoSetupMerge = always
  64
  65 # git pull always does rebase by default
  66 autoSetupRebase = always
  67 [push]
  68 default = simple