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