chore(git): normalize config indentation
This commit is contained in:
+122
-121
@@ -1,189 +1,190 @@
|
|||||||
[include]
|
[include]
|
||||||
path = ~/.config/git/local
|
path = ~/.config/git/local
|
||||||
|
|
||||||
[pull]
|
[pull]
|
||||||
rebase = true
|
rebase = true
|
||||||
|
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = master
|
defaultBranch = master
|
||||||
|
|
||||||
[column]
|
[column]
|
||||||
ui = auto
|
ui = auto
|
||||||
|
|
||||||
[branch]
|
[branch]
|
||||||
autosetupmerge = true
|
autosetupmerge = true
|
||||||
|
|
||||||
[tag]
|
[tag]
|
||||||
sort = version:refname
|
sort = version:refname
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
algorithm = histogram
|
algorithm = histogram
|
||||||
colorMoved = plain
|
colorMoved = plain
|
||||||
mnemonicPrefix = true
|
mnemonicPrefix = true
|
||||||
renames = true
|
renames = true
|
||||||
|
|
||||||
[push]
|
[push]
|
||||||
default = tracking
|
default = tracking
|
||||||
autoSetupRemote = true
|
autoSetupRemote = true
|
||||||
followTags = true
|
followTags = true
|
||||||
|
|
||||||
[fetch]
|
[fetch]
|
||||||
prune = true
|
prune = true
|
||||||
pruneTags = true
|
pruneTags = true
|
||||||
all = true
|
all = true
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
# gpgsign = true
|
# gpgsign = true
|
||||||
|
|
||||||
[help]
|
[help]
|
||||||
autocorrect = prompt
|
autocorrect = prompt
|
||||||
|
|
||||||
[rerere]
|
[rerere]
|
||||||
enabled = true
|
enabled = true
|
||||||
autoupdate = true
|
autoupdate = true
|
||||||
|
|
||||||
[rebase]
|
[rebase]
|
||||||
autoSquash = true
|
autoSquash = true
|
||||||
autoStash = true
|
autoStash = true
|
||||||
|
|
||||||
[format]
|
[format]
|
||||||
pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset
|
pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset
|
||||||
|
|
||||||
[mergetool]
|
[mergetool]
|
||||||
layout = BASE,MERGED + BASE,LOCAL + BASE,REMOTE
|
layout = BASE,MERGED + BASE,LOCAL + BASE,REMOTE
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
conflictStyle = diff3
|
conflictStyle = diff3
|
||||||
summary = true
|
summary = true
|
||||||
verbosity = 1
|
verbosity = 1
|
||||||
tool = nvimdiff
|
tool = nvimdiff
|
||||||
|
|
||||||
[apply]
|
[apply]
|
||||||
whitespace = nowarn
|
whitespace = nowarn
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
excludesfile = ~/.config/git/gitignore
|
excludesfile = ~/.config/git/gitignore
|
||||||
autocrlf = false
|
autocrlf = false
|
||||||
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
|
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
|
||||||
|
|
||||||
[advice]
|
[advice]
|
||||||
statusHints = false
|
statusHints = false
|
||||||
|
|
||||||
[url "git@github.com:"]
|
[url "git@github.com:"]
|
||||||
insteadOf = "gh:"
|
insteadOf = "gh:"
|
||||||
pushInsteadOf = "github:"
|
pushInsteadOf = "github:"
|
||||||
pushInsteadOf = "git://github.com/"
|
pushInsteadOf = "git://github.com/"
|
||||||
|
|
||||||
[url "git://github.com/"]
|
[url "git://github.com/"]
|
||||||
insteadOf = "github:"
|
insteadOf = "github:"
|
||||||
|
|
||||||
[url "git@gist.github.com:"]
|
[url "git@gist.github.com:"]
|
||||||
insteadOf = "gst:"
|
insteadOf = "gst:"
|
||||||
pushInsteadOf = "gist:"
|
pushInsteadOf = "gist:"
|
||||||
pushInsteadOf = "git://gist.github.com/"
|
pushInsteadOf = "git://gist.github.com/"
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
|
|
||||||
# annex
|
# annex
|
||||||
xl = annex list
|
xl = annex list
|
||||||
xg = annex list
|
xg = annex list
|
||||||
|
|
||||||
# add
|
# add
|
||||||
a = add
|
a = add
|
||||||
padd = add --patch
|
padd = add --patch
|
||||||
|
|
||||||
# branch
|
# branch
|
||||||
b = branch -v
|
b = branch -v
|
||||||
br = branch
|
br = branch
|
||||||
branches = branch -a
|
branches = branch -a
|
||||||
|
|
||||||
#switch
|
#switch
|
||||||
sw = switch
|
sw = switch
|
||||||
|
|
||||||
# commit
|
# commit
|
||||||
c = commit -m
|
c = commit -m
|
||||||
ca = commit -am
|
ca = commit -am
|
||||||
ci = commit
|
ci = commit
|
||||||
cam = commit --amend
|
cam = commit --amend
|
||||||
cama = commit --amend -a
|
cama = commit --amend -a
|
||||||
|
|
||||||
# clean
|
# clean
|
||||||
cl = clean
|
cl = clean
|
||||||
cldf = clean -df
|
cldf = clean -df
|
||||||
|
|
||||||
# checkout
|
# checkout
|
||||||
co = checkout
|
co = checkout
|
||||||
nb = checkout -b
|
nb = checkout -b
|
||||||
|
|
||||||
# cherry-pick
|
# cherry-pick
|
||||||
cp = cherry-pick -x # grab a change from a branch
|
cp = cherry-pick -x # grab a change from a branch
|
||||||
|
|
||||||
# diff
|
# diff
|
||||||
d = diff
|
d = diff
|
||||||
dc = diff --cached
|
dc = diff --cached
|
||||||
last = diff HEAD^
|
last = diff HEAD^
|
||||||
|
|
||||||
# log
|
# log
|
||||||
l = log --graph --date=short
|
l = log --graph --date=short
|
||||||
wu = log -p origin..@{0}
|
la = log --graph --date=short --all
|
||||||
changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
|
wu = log -p origin..@{0}
|
||||||
short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\"
|
changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
|
||||||
changelog = log --pretty=format:\" * %s\"
|
short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\"
|
||||||
shortnocolor = log --pretty=format:\"%h %cr %cn %s\"
|
changelog = log --pretty=format:\" * %s\"
|
||||||
lg = log --pretty=format:'%Cred%h%Creset - %C(blue bold)[%ad] %Creset%C(yellow)%d %Creset%s %C(green bold)<%an>%Creset' --abbrev-commit --date=short
|
shortnocolor = log --pretty=format:\"%h %cr %cn %s\"
|
||||||
llg = log --pretty=format:'%Cred%h%Creset - %C(blue bold)[%ad] %Creset%C(yellow)%d %Creset%s %C(green bold)<%an>%Creset' --abbrev-commit --date=short --graph
|
lg = log --pretty=format:'%Cred%h%Creset - %C(blue bold)[%ad] %Creset%C(yellow)%d %Creset%s %C(green bold)<%an>%Creset' --abbrev-commit --date=short
|
||||||
lls = git log --pretty=format:"[%h] %ae, %ar: %s" --stat
|
llg = log --pretty=format:'%Cred%h%Creset - %C(blue bold)[%ad] %Creset%C(yellow)%d %Creset%s %C(green bold)<%an>%Creset' --abbrev-commit --date=short --graph
|
||||||
filelog = log -u
|
lls = git log --pretty=format:"[%h] %ae, %ar: %s" --stat
|
||||||
lc = log ORIG_HEAD.. --stat --no-merges
|
filelog = log -u
|
||||||
|
lc = log ORIG_HEAD.. --stat --no-merges
|
||||||
|
|
||||||
# rebase
|
# rebase
|
||||||
rc = rebase --continue
|
rc = rebase --continue
|
||||||
rs = rebase --skip
|
rs = rebase --skip
|
||||||
|
|
||||||
# remote
|
# remote
|
||||||
r = remote -v
|
r = remote -v
|
||||||
|
|
||||||
# reset
|
# reset
|
||||||
res = reset
|
res = reset
|
||||||
unstage = reset -q HEAD --
|
unstage = reset -q HEAD --
|
||||||
discard = checkout --
|
discard = checkout --
|
||||||
uncommit = reset --mixed HEAD~
|
uncommit = reset --mixed HEAD~
|
||||||
undo = reset --hard
|
undo = reset --hard
|
||||||
|
|
||||||
# diff
|
# diff
|
||||||
df = diff --summary
|
df = diff --summary
|
||||||
staged = diff --cached
|
staged = diff --cached
|
||||||
diffstat = diff --stat
|
diffstat = diff --stat
|
||||||
changes = diff --name-status -r
|
changes = diff --name-status -r
|
||||||
|
|
||||||
# stash
|
# stash
|
||||||
stashes = stash list
|
stashes = stash list
|
||||||
ss = stash
|
ss = stash
|
||||||
sl = stash list
|
sl = stash list
|
||||||
sa = stash apply
|
sa = stash apply
|
||||||
sd = stash drop
|
sd = stash drop
|
||||||
|
|
||||||
# status
|
# status
|
||||||
s = status
|
s = status
|
||||||
st = status -s
|
st = status -s
|
||||||
|
|
||||||
# tag
|
# tag
|
||||||
t = tag -n
|
t = tag -n
|
||||||
|
|
||||||
# merge
|
# merge
|
||||||
mt = mergetool
|
mt = mergetool
|
||||||
dt = difftools
|
dt = difftools
|
||||||
|
|
||||||
rv = review
|
rv = review
|
||||||
ls = ls-files
|
ls = ls-files
|
||||||
gconf = config --global
|
gconf = config --global
|
||||||
|
|
||||||
c = clone --recursive
|
c = clone --recursive
|
||||||
bc = clone --bare
|
bc = clone --bare
|
||||||
|
|
||||||
# worktree
|
# worktree
|
||||||
wta = worktree add
|
wta = worktree add
|
||||||
wtl = worktree list
|
wtl = worktree list
|
||||||
wtr = worktree remove
|
wtr = worktree remove
|
||||||
|
|
||||||
ignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi"
|
ignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi"
|
||||||
|
|||||||
Reference in New Issue
Block a user