diff --git a/.gitconfig b/.gitconfig index 1adab59..fb9c7d1 100644 --- a/.gitconfig +++ b/.gitconfig @@ -4,8 +4,11 @@ signingkey = DD5E787D6C678F3F64 [alias] add-commit = !git add -A && git commit - 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" + 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" [credential] helper = store [global] @@ -15,3 +18,5 @@ defaultBranch = main [pull] rebase = false +[branch] + autosetuprebase = always diff --git a/.vimrc b/.vimrc index 94cfa94..8b9a5b8 100644 --- a/.vimrc +++ b/.vimrc @@ -1,2 +1,4 @@ set spell spelllang=en_us syntax on +set number +