diff options
| -rw-r--r-- | .bash_profile | 8 | ||||
| -rw-r--r-- | .gitconfig | 17 |
2 files changed, 21 insertions, 4 deletions
diff --git a/.bash_profile b/.bash_profile index e9ba68e..8121b2f 100644 --- a/.bash_profile +++ b/.bash_profile @@ -18,7 +18,7 @@ export HISTCONTROL=erasedups # remove consecutive history entries export EDITOR='vim' # Default editor export TERM="xterm-256color" export GREP_OPTIONS="--color=auto" -export HOMEBREW_GITHUB_API_TOKEN="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" +export HOMEBREW_GITHUB_API_TOKEN="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" export PS1="[a14m] \W \$ " export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 @@ -42,7 +42,6 @@ alias gpgkill='( gpg-connect-agent /bye )' alias cgit='docker run --name cgit -v $(pwd):/srv -p 1313:80 --rm -it cgit' -alias assume=". assume" # alias g='git' # # look up the original completion command and replace the last with the alias @@ -175,3 +174,8 @@ fi if command -v clang-format 1>/dev/null 2>&1; then export PATH="/opt/homebrew/opt/sphinx-doc/bin:$PATH" fi + +alias assume=". assume" +alias glab_assume="export GITLAB_TOKEN=$(pass mbition/git | grep token | awk '{ print $NF}')" +alias glab_su_assume="export GITLAB_TOKEN=$(pass mbition/git | grep su_token | awk '{ print $NF}')" +alias glab_baas_assume="export GITLAB_TOKEN=$(pass mbition/git | grep baas_token | awk '{ print $NF}')" @@ -4,6 +4,9 @@ ui = true status = auto branch = auto +[column] + ui = auto + status = never [core] editor = vim excludesfile = ~/.gitignore_global @@ -14,7 +17,8 @@ email = [email protected] username = a14m signingkey = 83786B48F734C4F7C2CEEC30D9FDD29DE1EA6405! -; [branch] +[branch] + sort = -committerdate ; autosetuprebase = always [diff] algorithm = patience @@ -23,7 +27,7 @@ br = branch df = diff co = checkout - cm = commit --verbose + cm = commit ls = log --oneline --decorate lg = log --oneline --graph ldf = diff --cached HEAD^ @@ -40,7 +44,16 @@ prune = true [commit] gpgsign = true + verbose = true [rerere] enabled = true + autoUpdate = true +[tag] + sort = -version:refname +[maintenance] + auto = true + strategy = incremental +[help] + autocorrect = prompt [includeIf "gitdir/i:~/Work/MBition/"] path = ~/.gitconfig.work.inc |