mac updates

bobsled/mac_updates
Adam Veldhousen 9 months ago
parent 68c65fe069
commit 5848e8f94f
No known key found for this signature in database

@ -1,7 +1,8 @@
#!/bin/env bash #!/bin/env bash
export LINUX_BREW_PATH="/home/linuxbrew/.linuxbrew"; export LINUX_BREW_PATH="/home/linuxbrew/.linuxbrew";
export MAC_BREW_PATH="/usr/local/Homebrew"; export MAC_BREW_PATH="/opt/homebrew/";
if [[ ! -d "${LINUX_BREW_PATH}" && ! -d "${MAC_BREW_PATH}" ]]; then if [[ ! -d "${LINUX_BREW_PATH}" && ! -d "${MAC_BREW_PATH}" ]]; then
echo "Installing brew"; echo "Installing brew";

@ -1,6 +1,7 @@
[alias] [alias]
# View abbreviated SHA, description, and history graph # View abbreviated SHA, description, and history graph
ls = log --pretty=format:'%Cblue%h -%d %Cgreen%an %Creset%s - %Cred%GS' --abbrev-commit --date=relative --branches --graph -n 45 ls = log --pretty=format:'%Cblue%h -%d %Cgreen%an %Creset%s - %Cred%GS' --abbrev-commit --date=relative --branches --graph -n 75
lsa = log --pretty=format:'%Cblue%h -%d %Cgreen%an %Creset%s - %Cred%GS' --abbrev-commit --date=relative --branches --graph
# View the current working tree status using the short format # View the current working tree status using the short format
s = status -s s = status -s
@ -22,12 +23,6 @@
# Commit all changes # Commit all changes
ca = !git add -A && git commit -av -S ca = !git add -A && git commit -av -S
# commits with gpgsign flag
cs = commit -S
# commits with gpgsign and inline message flag
csm = commit -S -m
# Switch to a branch, creating it if necessary # Switch to a branch, creating it if necessary
go = checkout -B go = checkout -B
@ -57,7 +52,7 @@
# Find commits by commit message # Find commits by commit message
fm = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f" fm = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"
# Remove branches that have already been merged with master # Remove branches that have already been merged with master
dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d" dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
[diff] [diff]
@ -126,12 +121,9 @@
# Include summaries of merged commits in newly created merge commit messages # Include summaries of merged commits in newly created merge commit messages
log = true log = true
# better merge messages # better merge messages
summary=true summary = true
# URL shorthands # URL shorthands
[url "https://git.vdhsn.com"]
insteadOf = git@git.vdhsn.com
[url "git://github.com/"] [url "git://github.com/"]
insteadOf = "github:" insteadOf = "github:"
@ -148,7 +140,7 @@
[pull] [pull]
default = current default = current
ff = only ff = only
[user] [user]
email = adamveld12@gmail.com email = adamveld12@gmail.com
@ -160,7 +152,7 @@
template = ~/.config/git/.gitmessage template = ~/.config/git/.gitmessage
[help] [help]
autocorrect=20 autocorrect = 20
[credential] [credential]
# for OSX # for OSX
@ -170,3 +162,6 @@
[gpg] [gpg]
program = gpg program = gpg
[rerere]
enabled = true

Loading…
Cancel
Save