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

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