update git config: reorder aliases, drop nvimdiff, add lg
This commit is contained in:
+22
-28
@@ -12,9 +12,10 @@ ui = auto
|
|||||||
|
|
||||||
[branch]
|
[branch]
|
||||||
autosetupmerge = true
|
autosetupmerge = true
|
||||||
|
sort = -committerdate
|
||||||
|
|
||||||
[tag]
|
[tag]
|
||||||
sort = version:refname
|
sort = -version:refname
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
algorithm = histogram
|
algorithm = histogram
|
||||||
@@ -33,11 +34,9 @@ pruneTags = true
|
|||||||
all = true
|
all = true
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
|
verbose = true
|
||||||
# gpgsign = true
|
# gpgsign = true
|
||||||
|
|
||||||
[help]
|
|
||||||
autocorrect = prompt
|
|
||||||
|
|
||||||
[rerere]
|
[rerere]
|
||||||
enabled = true
|
enabled = true
|
||||||
autoupdate = true
|
autoupdate = true
|
||||||
@@ -56,7 +55,6 @@ layout = BASE,MERGED + BASE,LOCAL + BASE,REMOTE
|
|||||||
conflictStyle = zdiff3
|
conflictStyle = zdiff3
|
||||||
summary = true
|
summary = true
|
||||||
verbosity = 1
|
verbosity = 1
|
||||||
tool = nvimdiff
|
|
||||||
|
|
||||||
[apply]
|
[apply]
|
||||||
whitespace = nowarn
|
whitespace = nowarn
|
||||||
@@ -69,25 +67,8 @@ whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
|
|||||||
[advice]
|
[advice]
|
||||||
statusHints = false
|
statusHints = false
|
||||||
|
|
||||||
[url "git@github.com:"]
|
|
||||||
insteadOf = "gh:"
|
|
||||||
pushInsteadOf = "github:"
|
|
||||||
pushInsteadOf = "git://github.com/"
|
|
||||||
|
|
||||||
[url "git://github.com/"]
|
|
||||||
insteadOf = "github:"
|
|
||||||
|
|
||||||
[url "git@gist.github.com:"]
|
|
||||||
insteadOf = "gst:"
|
|
||||||
pushInsteadOf = "gist:"
|
|
||||||
pushInsteadOf = "git://gist.github.com/"
|
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
|
|
||||||
# annex
|
|
||||||
xl = annex list
|
|
||||||
xg = annex list
|
|
||||||
|
|
||||||
# add
|
# add
|
||||||
a = add
|
a = add
|
||||||
padd = add --patch
|
padd = add --patch
|
||||||
@@ -127,16 +108,16 @@ last = diff HEAD^
|
|||||||
# log
|
# log
|
||||||
l = log --graph --date=short
|
l = log --graph --date=short
|
||||||
la = log --graph --date=short --all
|
la = log --graph --date=short --all
|
||||||
|
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
|
||||||
|
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
|
||||||
|
lls = git log --pretty=format:"[%h] %ae, %ar: %s" --stat
|
||||||
|
lc = log ORIG_HEAD.. --stat --no-merges
|
||||||
wu = log -p origin..@{0}
|
wu = log -p origin..@{0}
|
||||||
changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
|
changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
|
||||||
short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\"
|
short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\"
|
||||||
changelog = log --pretty=format:\" * %s\"
|
changelog = log --pretty=format:\" * %s\"
|
||||||
shortnocolor = log --pretty=format:\"%h %cr %cn %s\"
|
shortnocolor = log --pretty=format:\"%h %cr %cn %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
|
|
||||||
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
|
|
||||||
lls = git log --pretty=format:"[%h] %ae, %ar: %s" --stat
|
|
||||||
showfiles = show --name-only
|
showfiles = show --name-only
|
||||||
lc = log ORIG_HEAD.. --stat --no-merges
|
|
||||||
|
|
||||||
# rebase
|
# rebase
|
||||||
rc = rebase --continue
|
rc = rebase --continue
|
||||||
@@ -159,7 +140,6 @@ diffstat = diff --stat
|
|||||||
changes = diff --name-status -r
|
changes = diff --name-status -r
|
||||||
|
|
||||||
# stash
|
# stash
|
||||||
stashes = stash list
|
|
||||||
ss = stash
|
ss = stash
|
||||||
sl = stash list
|
sl = stash list
|
||||||
sa = stash apply
|
sa = stash apply
|
||||||
@@ -178,7 +158,6 @@ dt = difftools
|
|||||||
|
|
||||||
rv = review
|
rv = review
|
||||||
ls = ls-files
|
ls = ls-files
|
||||||
gconf = config --global
|
|
||||||
|
|
||||||
c = clone --recursive
|
c = clone --recursive
|
||||||
bc = clone --bare
|
bc = clone --bare
|
||||||
@@ -189,9 +168,24 @@ 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"
|
||||||
|
|
||||||
|
[url "git@github.com:"]
|
||||||
|
insteadOf = "gh:"
|
||||||
|
pushInsteadOf = "github:"
|
||||||
|
pushInsteadOf = "git://github.com/"
|
||||||
|
|
||||||
|
[url "git://github.com/"]
|
||||||
|
insteadOf = "github:"
|
||||||
|
|
||||||
|
[url "git@gist.github.com:"]
|
||||||
|
insteadOf = "gst:"
|
||||||
|
pushInsteadOf = "gist:"
|
||||||
|
pushInsteadOf = "git://gist.github.com/"
|
||||||
|
|
||||||
[credential "https://git.nca.uwo.ca"]
|
[credential "https://git.nca.uwo.ca"]
|
||||||
helper =
|
helper =
|
||||||
helper = !tea login helper
|
helper = !tea login helper
|
||||||
|
|
||||||
[credential "http://gitea.sagacity.ca"]
|
[credential "http://gitea.sagacity.ca"]
|
||||||
helper =
|
helper =
|
||||||
helper = !tea login helper
|
helper = !tea login helper
|
||||||
|
|||||||
Reference in New Issue
Block a user