fix git aliases diff, fix editorconfig with max line length
This commit is contained in:
parent
8f44f46bf5
commit
d832ce3369
@ -11,9 +11,8 @@
|
|||||||
commitEncoding = utf-8
|
commitEncoding = utf-8
|
||||||
logOutputEncoding = utf-8
|
logOutputEncoding = utf-8
|
||||||
|
|
||||||
|
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = master
|
defaultBranch = master
|
||||||
|
|
||||||
[push]
|
[push]
|
||||||
default = current
|
default = current
|
||||||
@ -47,8 +46,8 @@
|
|||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
a = "!git ls-files --exclude-standard -m --others -t | fzf -m --bind ctrl-a:toggle-all | cut -d' ' -f2 | xargs git add"
|
a = "!git ls-files --exclude-standard -m --others -t | fzf -m --bind ctrl-a:toggle-all | cut -d' ' -f2 | xargs git add"
|
||||||
d = diff --color-words
|
d = diff
|
||||||
ds = diff --staged --color-words
|
ds = diff --staged
|
||||||
dno = diff --name-only
|
dno = diff --name-only
|
||||||
co = checkout
|
co = checkout
|
||||||
ci = commit
|
ci = commit
|
||||||
@ -99,5 +98,4 @@
|
|||||||
[url "git@gist.github.com:"]
|
[url "git@gist.github.com:"]
|
||||||
pushInsteadOf = "https://gist.github.com/"
|
pushInsteadOf = "https://gist.github.com/"
|
||||||
pushInsteadOf = "http://gist.github.com/"
|
pushInsteadOf = "http://gist.github.com/"
|
||||||
pushInsteadOf = "gist:"
|
pushInsteadOf = "gist:"
|
||||||
|
|
||||||
@ -4,5 +4,4 @@ indent_size = 4
|
|||||||
tab_width = 4
|
tab_width = 4
|
||||||
end_of_line = lf
|
end_of_line = lf
|
||||||
insert_final_newline = false
|
insert_final_newline = false
|
||||||
max_line_length = 80
|
trim_trailing_whitespace = true
|
||||||
trim_trailing_whitespace = true
|
|
||||||
Loading…
x
Reference in New Issue
Block a user