[alias] amend = commit --amend --no-edit --reset-author assume = update-index --assume-unchanged assumed = !git ls-files -v | grep '^[hsmrck?]' | cut -c 3- fixup = commit --fixup ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative prune = remote prune origin remotes = remote -v staged = diff --staged unassume = update-index --no-assume-unchanged undo = reset --hard unmerged = branch --no-merged unmerged-remote = branch --remote --no-merged unstage = reset HEAD -- word-diff = diff --word-diff [branch] autosetupmerge = true autosetuprebase = always [checkout] defaultRemote = origin [color] branch = auto diff = auto status = auto ui = true [color "branch"] current = red reverse local = blue remote = green [color "diff"] meta = yellow frag = magenta old = red bold new = green plain = white [color "status"] added = yellow changed = green untracked = cyan [commit] template = ~/.gitmessage verbose = true [core] excludesFile = ~/.gitignore [diff] tool = vimdiff [fetch] # Always prune when fetching (and pulling). prune = true [gitsh] nogreeting = true [grep] # Show the line numbers in the output. lineNumber = true [help] autocorrect = 1 [include] path = ~/.gitconfig.local [rebase] autosquash = true autostash = true [rerere] # Store and re-use manual conflict resolution changes. enabled = true [push] default = upstream [url "https://git.drupal.org/project/"] insteadOf = do: insteadOf = drupal: [pull] ff = only rebase = true [merge] defaultToUpstream = true ff = false [filter "lfs"] process = git-lfs filter-process required = true clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f