diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..70fd16a --- /dev/null +++ b/.gitconfig @@ -0,0 +1,38 @@ +[user] + name = jdb + email = jack.baldry@oracle.com +[core] + pager = diff-so-fancy | less --tabs=4 -RFX +[color] + ui = true +[color "diff-highlight"] + oldNormal = red bold + oldHighlight = red bold 52 + newNormal = green bold + newHighlight = green bold 22 +[color "diff"] + meta = yellow + frag = magenta bold + commit = yellow bold + old = red bold + new = green bold + whitespace = red reverse +[alias] + st = status + ci = commit + br = branch + co = checkout +[url "git@gitlab.oracledatacloud.com:"] + insteadOf = https://gitlab.oracledatacloud.com/ +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true +[pull] + replace = preserve + rebase = merges +[gpg] + program = /usr/bin/gpg2 +[rebase] + autoStash = true diff --git a/bashrc.d/variables b/bashrc.d/variables index b3e4649..2f78451 100644 --- a/bashrc.d/variables +++ b/bashrc.d/variables @@ -7,11 +7,6 @@ export EDITOR=vim # Disable homebrew analytics collection export HOMEBREW_NO_ANALYTICS=1 -# Add go binary directories -# Append k8s.git/tools path for work convenience -# Add cargo binary directory for Rust -export PATH=/bin:/sbin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin:/usr/local/go/bin:~/bin:~/go/bin:~/.local/bin:~/git/k8s/tools:~/git/k8s/tools/vault:~/.cargo/bin - # Set environment file location for ssh-agent configuration on login export SSH_ENV="$HOME/.ssh/environment"