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 [github]
  16 user = ian-kelling
  17 token = d2dc0c5c6fef5378cc896a617e53c1a9
  18 [credential]
  19 helper = cache
  20
  21 # new option, but not available yet on debian wheezy
  22 # [push]
  23 #       default = simple
  24
  25 # based on ghc advice,
  26 # https://ghc.haskell.org/trac/ghc/wiki/Building/GettingTheSources
  27 [diff]
  28 ignoreSubmodules = dirty
  29 tool = meld
  30
  31 [gitreview]
  32 username = iank
  33 remote = origin
  34 # this is for newer git version. Doesn't work for ubuntu 12.04's version
  35 #[push]
  36 #       default = simple
  37 [color]
  38 ui = auto
  39 status = auto
  40 branch = auto
  41 interactive = auto
  42 diff = auto
  43 # for hooks. http://stackoverflow.com/questions/2293498/git-commit-hooks-global-settings
  44 [init]
  45 templatedir = ~/.git_template
  46 [difftool]
  47 tool = meld
  48 prompt = false
  49 [format]
  50 # This seemed like a good idea, but it broke interactive rebase, so disabled.
  51 # for format-patch, use --base=auto. This means we need to do
  52 # git branch --set-upstream-to, but that should be done automatically
  53 # based on other settings.
  54 #       useAutoBase = true
  55 [branch]
  56 # Disabled as this was to be used with useAutoBase, which didn't work as expected.
  57 # sets local branches to have the same remote tracking branch.
  58 # This allows the useAutoBase setting to work without having to
  59 # setup the branch specially with
  60 # git branch --set-upstream-to origin/my_branch
  61 # or git checkout -b my-branch origin/whatever
  62 #       autoSetupMerge = always
  63
  64 # git pull always does rebase by default
  65 autoSetupRebase = always
  66 [push]
  67 default = simple