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 # gitinspector complained, but then i noticed git not detecting a rename with this.
  30 #renamelimit = 5000
  31 renames = copy
  32
  33 [gitreview]
  34 username = iank
  35 remote = origin
  36 [color]
  37 ui = auto
  38 status = auto
  39 branch = auto
  40 interactive = auto
  41 diff = auto
  42 # for hooks. http://stackoverflow.com/questions/2293498/git-commit-hooks-global-settings
  43 [init]
  44 templatedir = ~/.git_template
  45 [difftool]
  46 tool = meld
  47 prompt = false
  48 [format]
  49 # This seemed like a good idea, but it broke interactive rebase, so disabled.
  50 # for format-patch, use --base=auto. This means we need to do
  51 # git branch --set-upstream-to, but that should be done automatically
  52 # based on other settings.
  53 #       useAutoBase = true
  54 [branch]
  55 # Disabled as this was to be used with useAutoBase, which didn't work as expected.
  56 # sets local branches to have the same remote tracking branch.
  57 # This allows the useAutoBase setting to work without having to
  58 # setup the branch specially with
  59 # git branch --set-upstream-to origin/my_branch
  60 # or git checkout -b my-branch origin/whatever
  61 #       autoSetupMerge = always
  62
  63 # git pull always does rebase by default
  64 autoSetupRebase = always
  65 [push]
  66 default = simple