From d832ce3369300c795a918c351fa9c60303bfc1e7 Mon Sep 17 00:00:00 2001 From: thek4n Date: Mon, 22 Jan 2024 09:43:32 +0300 Subject: [PATCH] fix git aliases diff, fix editorconfig with max line length --- home/user/.config/git/config | 10 ++++------ home/user/.editorconfig | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/home/user/.config/git/config b/home/user/.config/git/config index 7465480..d668f44 100644 --- a/home/user/.config/git/config +++ b/home/user/.config/git/config @@ -11,9 +11,8 @@ commitEncoding = utf-8 logOutputEncoding = utf-8 - [init] - defaultBranch = master + defaultBranch = master [push] default = current @@ -47,8 +46,8 @@ [alias] 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 - ds = diff --staged --color-words + d = diff + ds = diff --staged dno = diff --name-only co = checkout ci = commit @@ -99,5 +98,4 @@ [url "git@gist.github.com:"] pushInsteadOf = "https://gist.github.com/" pushInsteadOf = "http://gist.github.com/" - pushInsteadOf = "gist:" - + pushInsteadOf = "gist:" \ No newline at end of file diff --git a/home/user/.editorconfig b/home/user/.editorconfig index d01f9c4..1a1c76d 100644 --- a/home/user/.editorconfig +++ b/home/user/.editorconfig @@ -4,5 +4,4 @@ indent_size = 4 tab_width = 4 end_of_line = lf insert_final_newline = false -max_line_length = 80 -trim_trailing_whitespace = true +trim_trailing_whitespace = true \ No newline at end of file