diff --git a/.gitconfig b/.gitconfig index fb9c7d1..1adab59 100644 --- a/.gitconfig +++ b/.gitconfig @@ -4,11 +4,8 @@ signingkey = DD5E787D6C678F3F64 [alias] add-commit = !git add -A && git commit - report = log --author=J --since='2 sunday ago' --until='1 sunday ago' --format='%Cgreen%ci%Creset %s%Creset' --no-merges - report-csv = log --author=Marco --since='2 sunday ago' --until='1 sunday ago' --format='\"%ci\",\"%s\"' --no-merges - lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all - lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all - lg = !"git lg1" + report = "log --author=Joe --since='2 sunday ago' --until='1 sunday ago' --format='%Cgreen%ci%Creset %s%Creset' --no-merges" + report-csv = "log --author=Marco --since='2 sunday ago' --until='1 sunday ago' --format='\"%ci\",\"%s\"' --no-merges" [credential] helper = store [global] @@ -18,5 +15,3 @@ defaultBranch = main [pull] rebase = false -[branch] - autosetuprebase = always diff --git a/.vimrc b/.vimrc index 8b9a5b8..94cfa94 100644 --- a/.vimrc +++ b/.vimrc @@ -1,4 +1,2 @@ set spell spelllang=en_us syntax on -set number -