fix 🐞: Git Config (Pager and Diff)
This commit is contained in:
parent
6d3f5b4aa3
commit
f68f2e5717
7 changed files with 63 additions and 56 deletions
99
git/config
99
git/config
|
@ -23,64 +23,63 @@
|
|||
defaultBranch = dev
|
||||
|
||||
[diff]
|
||||
context = 3
|
||||
renames = copies
|
||||
interHunkContext = 10
|
||||
context = 3
|
||||
renames = copies
|
||||
interHunkContext = 10
|
||||
[pager]
|
||||
diff = diff-so-fancy | less --tabs=4 -RFX
|
||||
|
||||
# [pager]
|
||||
# diff = diff-so-fancy | $PAGER
|
||||
|
||||
# [diff-so-fancy]
|
||||
# markEmptyLines = true
|
||||
[diff-so-fancy]
|
||||
markEmptyLines = true
|
||||
|
||||
[color "diff"]
|
||||
meta = black bold
|
||||
fraq = magenta
|
||||
context = white
|
||||
whitespace = yellow reverse
|
||||
old = red
|
||||
meta = yellow bold
|
||||
fraq = magenta
|
||||
context = white
|
||||
whitespace = yellow reverse
|
||||
old = red
|
||||
|
||||
[interactive]
|
||||
diffFilter = diff-so-fancy --patch
|
||||
singleKey = true
|
||||
diffFilter = diff-so-fancy --patch
|
||||
singleKey = true
|
||||
|
||||
[commit]
|
||||
gpgSign = false
|
||||
template = ~/.config/git/template
|
||||
|
||||
[push]
|
||||
autoSetupRemote = true
|
||||
default = current
|
||||
followTags = true
|
||||
gpgSign = false
|
||||
autoSetupRemote = true
|
||||
default = current
|
||||
followTags = true
|
||||
gpgSign = false
|
||||
|
||||
[pull]
|
||||
default = current
|
||||
rebase = true
|
||||
default = current
|
||||
rebase = true
|
||||
|
||||
[rebase]
|
||||
autoStash = true
|
||||
missingCommitsCheck = warn
|
||||
autoStash = true
|
||||
missingCommitsCheck = warn
|
||||
|
||||
[submodule]
|
||||
fetchJobs = 16
|
||||
|
||||
[color "blame"]
|
||||
highlightRecent = black bold,1 year ago,white,1 month ago,default,7 days ago,blue
|
||||
highlightRecent = black bold,1 year ago,white,1 month ago,default,7 days ago,blue
|
||||
|
||||
[log]
|
||||
abbrevCommit = true
|
||||
graphColors = blue,yellow,cyan,magenta,green,red
|
||||
abbrevCommit = true
|
||||
graphColors = blue,yellow,cyan,magenta,green,red
|
||||
|
||||
[blame]
|
||||
coloring = highlightRecent
|
||||
date = relative
|
||||
coloring = highlightRecent
|
||||
date = relative
|
||||
|
||||
[status]
|
||||
branch = true
|
||||
short = true
|
||||
showStash = true
|
||||
showUntrackedFiles = all
|
||||
branch = true
|
||||
short = true
|
||||
showStash = true
|
||||
showUntrackedFiles = all
|
||||
|
||||
[color "branch"]
|
||||
current = magenta
|
||||
|
@ -90,27 +89,27 @@
|
|||
plain = blue
|
||||
|
||||
[alias]
|
||||
st = status
|
||||
ss = status -s
|
||||
ci = commit
|
||||
co = checkout
|
||||
br = branch -a
|
||||
aa = add -A
|
||||
ap = add --patch
|
||||
cdf = clean -df
|
||||
st = status
|
||||
ss = status -s
|
||||
ci = commit
|
||||
co = checkout
|
||||
br = branch -a
|
||||
aa = add -A
|
||||
ap = add --patch
|
||||
cdf = clean -df
|
||||
|
||||
lo = log --oneline
|
||||
l = log --all --graph --decorate --oneline --abbrev-commit --date=short
|
||||
r = remote
|
||||
conf = config --global --edit
|
||||
df = diff
|
||||
structure = log --oneline --simplify-by-decoration --graph --all
|
||||
slog = log --pretty=format:'%C(auto)%h %C(red)%as %C(blue)%aN%C(auto)%d%C(green) %s'
|
||||
s5 = slog -5 --graph
|
||||
s10 = slog -10
|
||||
lo = log --oneline
|
||||
l = log --all --graph --decorate --oneline --abbrev-commit --date=short
|
||||
r = remote
|
||||
conf = config --global --edit
|
||||
df = diff
|
||||
structure = log --oneline --simplify-by-decoration --graph --all
|
||||
slog = log --pretty=format:'%C(auto)%h %C(red)%as %C(blue)%aN%C(auto)%d%C(green) %s'
|
||||
s5 = slog -5 --graph
|
||||
s10 = slog -10
|
||||
|
||||
# [gpg]
|
||||
# format = opengpg
|
||||
|
||||
[gpg "ssh"]
|
||||
program = ssh-keygen
|
||||
program = ssh-keygen
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue