dotfiles/roles/git/files/.gitconfig

138 lines
2.9 KiB
INI
Raw Normal View History

2015-07-06 15:20:24 +00:00
[alias]
2020-01-15 01:41:18 +00:00
aa = add --all
2017-05-08 20:49:08 +00:00
assume = update-index --assume-unchanged
assumed = !git ls-files -v | grep '^[hsmrck?]' | cut -c 3-
2020-01-15 01:41:18 +00:00
b = branch
browse = !hub browse
ca = commit --amend --verbose
car = commit --amend --no-edit
2020-01-15 08:42:02 +00:00
cl = !hub clone
2021-11-10 10:57:43 +00:00
cl = !hub clone
2020-01-15 01:41:18 +00:00
co = checkout
compare = !hub compare
2020-01-21 12:12:17 +00:00
current-branch = rev-parse --abbrev-ref HEAD
2020-01-15 01:41:18 +00:00
dc = diff --color --word-diff --cached
df = diff --color --word-diff
dup = !git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -
2017-05-08 20:49:08 +00:00
fixup = commit --fixup
2020-01-15 01:41:18 +00:00
issues = !hub browse -- issues
mup = !git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -
2020-01-15 01:41:18 +00:00
nah = !git reset --hard && git clean -fd
no-ff = merge --no-ff
pl = pull
2017-05-08 20:49:08 +00:00
prune = remote prune origin
2020-01-15 01:41:18 +00:00
ps = push
pulls = !hub browse -- pulls
rbc = rebase --continue
rdup = !git dup && git rebase develop
2017-05-08 20:49:08 +00:00
remotes = remote -v
2020-01-15 01:41:18 +00:00
repush = !git pull --rebase && git push
ri = rebase --interactive
rid = !git rebase -i $(git merge-base develop HEAD)
rim = !git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)
rip = !git rebase -i $(git merge-base production HEAD)
ris = !git rebase -i $(git merge-base staging HEAD)
2020-01-15 01:41:18 +00:00
riu = !git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})
2021-11-10 10:57:43 +00:00
rmup = !git mup && git master-to-main-wrapper rebase %BRANCH%
2020-01-15 01:41:18 +00:00
sl = log --oneline --decorate -20
sla = log --oneline --decorate --graph --all -20
slap = log --oneline --decorate --graph --all
slp = log --oneline --decorate
2017-05-08 20:49:08 +00:00
staged = diff --staged
2018-04-27 20:55:15 +00:00
unassume = update-index --no-assume-unchanged
2020-01-15 01:41:18 +00:00
uncommit = reset --soft HEAD^
unstage = reset
upstream = rev-parse --abbrev-ref --symbolic-full-name @{u}
ureset = !git reset --hard $(git upstream)
wip = !git add . && git commit -m 'wip'
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]
2020-01-15 07:54:57 +00:00
defaultRemote = origin
2019-03-20 13:26:57 +00:00
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]
2021-08-07 00:22:50 +00:00
editor = nvim
2020-09-10 13:45:16 +00:00
excludesFile = ~/.gitignore-global
2022-07-18 11:36:32 +00:00
pager = delta
[delta]
line-numbers = true
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
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
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
[init]
templatedir = ~/.git_template
2020-04-29 10:30:20 +00:00
[merge]
ff = only
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
enabled = true
2015-11-16 13:46:56 +00:00
[push]
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
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