dotfiles/tag-git/gitconfig

103 lines
1.8 KiB
Plaintext
Raw Normal View History

2015-07-06 15:20:24 +00:00
[alias]
2018-04-27 20:55:15 +00:00
amend = commit --amend --no-edit --reset-author
2017-05-08 20:49:08 +00:00
assume = update-index --assume-unchanged
assumed = !git ls-files -v | grep '^[hsmrck?]' | cut -c 3-
fixup = commit --fixup
2018-04-27 20:55:15 +00:00
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
2017-05-08 20:49:08 +00:00
prune = remote prune origin
remotes = remote -v
staged = diff --staged
2018-04-27 20:55:15 +00:00
unassume = update-index --no-assume-unchanged
2017-05-08 20:49:08 +00:00
undo = reset --hard
2017-05-08 10:44:29 +00:00
unmerged = branch --no-merged
unmerged-remote = branch --remote --no-merged
2018-04-27 20:55:15 +00:00
unstage = reset HEAD --
word-diff = diff --word-diff
2015-07-06 15:20:24 +00:00
2015-10-28 23:51:41 +00:00
[branch]
2017-05-08 20:49:08 +00:00
autosetupmerge = true
autosetuprebase = always
2015-10-28 23:51:41 +00:00
2019-03-20 13:26:57 +00:00
[checkout]
defaultRemote = origin
2015-10-28 23:51:41 +00:00
[color]
2017-05-08 20:49:08 +00:00
branch = auto
diff = auto
status = auto
ui = true
2015-10-28 23:51:41 +00:00
2017-01-04 21:20:01 +00:00
[color "branch"]
2017-05-08 20:49:08 +00:00
current = red reverse
local = blue
remote = green
2017-01-04 21:20:01 +00:00
[color "diff"]
2017-05-08 20:49:08 +00:00
meta = yellow
frag = magenta
old = red bold
new = green
plain = white
2017-01-04 21:20:01 +00:00
[color "status"]
2017-05-08 20:49:08 +00:00
added = yellow
changed = green
untracked = cyan
2017-01-04 21:20:01 +00:00
[commit]
template = ~/.gitmessage
2017-05-08 20:49:08 +00:00
verbose = true
2015-07-06 15:20:24 +00:00
[core]
2019-10-05 23:06:53 +00:00
excludesFile = ~/.gitignore
2015-07-06 15:20:24 +00:00
2015-10-28 23:51:41 +00:00
[diff]
2017-05-08 20:49:08 +00:00
tool = vimdiff
2015-07-06 15:20:24 +00:00
[fetch]
2017-05-08 20:49:08 +00:00
# Always prune when fetching (and pulling).
prune = true
2015-07-06 15:20:24 +00:00
2015-10-28 23:51:41 +00:00
[gitsh]
2017-05-08 20:49:08 +00:00
nogreeting = true
2015-10-28 23:51:41 +00:00
[grep]
2017-05-08 20:49:08 +00:00
# Show the line numbers in the output.
lineNumber = true
2015-10-28 23:51:41 +00:00
2015-07-06 15:20:24 +00:00
[help]
2017-05-08 20:49:08 +00:00
autocorrect = 1
2015-07-06 15:20:24 +00:00
2015-10-28 23:51:41 +00:00
[include]
path = ~/.gitconfig.local
2015-10-26 20:54:35 +00:00
[rebase]
2017-05-08 20:49:08 +00:00
autosquash = true
autostash = true
2015-10-28 23:51:41 +00:00
[rerere]
2017-05-08 20:49:08 +00:00
# Store and re-use manual conflict resolution changes.
enabled = true
2015-11-16 13:46:56 +00:00
[push]
2020-01-15 00:57:15 +00:00
default = upstream
2016-01-14 18:28:19 +00:00
2016-01-14 22:19:35 +00:00
[url "https://git.drupal.org/project/"]
2017-05-08 20:49:08 +00:00
insteadOf = do:
insteadOf = drupal:
2016-01-14 22:19:35 +00:00
2016-01-14 18:28:19 +00:00
[pull]
2017-05-08 10:44:29 +00:00
ff = only
2017-05-08 20:49:08 +00:00
rebase = true
2016-01-14 18:35:40 +00:00
[merge]
2017-05-08 20:49:08 +00:00
defaultToUpstream = true
2017-05-08 10:44:29 +00:00
ff = false
2020-01-15 00:56:41 +00:00
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f