[user] name = Ian Kelling email = iank@fsf.org #email = ian@iankelling.org [alias] lg = log --graph lgstat = log --stat --graph --pretty=format:'%h %ad- %s [%an]' co = checkout s = status ci = commit lol = log --graph --pretty=oneline --abbrev-commit --all dt = difftool # https://stackoverflow.com/questions/17369254/is-there-a-way-to-cause-git-reflog-to-show-a-date-alongside-each-entry rl = reflog --format='%C(auto)%h %<|(17)%gd %C(blue)%ci%C(reset) %s' [core] excludesfile = ~/.gitignore_global # https://stackoverflow.com/questions/59061816/git-forces-refresh-index-after-switching-between-windows-and-linux # i'm hoping this stops refresh after btrfs sends, especially for brains checkStat = minimal [credential] helper = cache # 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 # 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 [color] 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 [difftool] 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, 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 # make git pull always rebase by default autoSetupRebase = always [push] default = simple # this is because on sending email, i got this prompt: # The Cc list above has been expanded by additional # addresses found in the patch commit message. By default # send-email prompts before sending whenever this occurs. # This behavior is controlled by the sendemail.confirm # configuration setting. # For additional information, run 'git send-email --help'. # To retain the current behavior, but squelch this message, # run 'git config --global sendemail.confirm auto'. # Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): y [sendemail] confirm = auto # https://stackoverflow.com/questions/70663523/the-unauthenticated-git-protocol-on-port-9418-is-no-longer-supported [url "https://github.com/"] insteadOf = git://github.com/