Skip to content

Instantly share code, notes, and snippets.

@royriojas
Last active April 5, 2020 21:03
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save royriojas/555e92a68d84a916e981317b317fa479 to your computer and use it in GitHub Desktop.
Save royriojas/555e92a68d84a916e981317b317fa479 to your computer and use it in GitHub Desktop.
dotfiles
[user]
# name = yourname
# email = <your@email>
[core]
whitespace = trailing-space,space-before-tab,cr-at-eol
excludesfile = ~/.gitignore_global
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[alias]
gui = !sh -c '/usr/local/git/libexec/git-core/git-gui'
st = status
ci = commit
br = branch
co = checkout
df = diff
dc = diff --cached
lg = log -p
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
ld = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
le = log --oneline --decorate
fl = log -u
dl = "!git ll -1"
dlc = diff --cached HEAD^
dr = "!f() { git diff "$1"^.."$1"; }; f"
lc = "!f() { git ll "$1"^.."$1"; }; f"
diffr = "!f() { git diff "$1"^.."$1"; }; f"
f = "!git ls-files | grep -i"
grep = grep -Ii
gr = grep -Ii
gra = "!f() { A=$(pwd) && TOPLEVEL=$(git rev-parse --show-toplevel) && cd $TOPLEVEL && git grep --full-name -In $1 | xargs -I{} echo $TOPLEVEL/{} && cd $A; }; f"
la = "!git config -l | grep alias | cut -c 7-"
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"
assumeall = "!git st -s | awk {'print $2'} | xargs git assume"
lt = describe --tags --abbrev=0
ours = "!f() { git co --ours $@ && git add $@; }; f"
theirs = "!f() { git co --theirs $@ && git add $@; }; f"
#list the stash
sl = stash list
#apply the stash
sa = stash apply
#stash save
ss = stash save
#stash pop
sp = stash pop
# Show files ignored by git:
ign = ls-files -o -i --exclude-standard
[diff]
tool = default-difftool
[difftool "default-difftool"]
#cmd = twdiff $LOCAL $REMOTE
#if meld installed
cmd = meld $LOCAL $REMOTE
#cmd = opendiff $LOCAL $REMOTE
#cmd = p4merge $LOCAL $REMOTE
[difftool]
prompt = false
[push]
default = tracking
[branch]
autosetuprebase = remote
[credential]
helper = osxkeychain
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
#[difftool "sourcetree"]
# cmd = opendiff \"$LOCAL\" \"$REMOTE\"
# path =
#[mergetool "sourcetree"]
# cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
# trustExitCode = true
[commit]
template = /Users/roy/.stCommitMsg
[rerere]
enabled = true
autoupdate = true
# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so
# Packages #
############
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
#*.tar
#*.zip
# Logs and databases #
######################
*.log
*.sql
*.sqlite
# OS generated files #
######################
.DS_Store*
ehthumbs.db
Thumbs.db
.idea/
node_modules/
set nocompatible
source $VIMRUNTIME/vimrc_example.vim
set selectmode=mouse
set backupdir=/tmp
set directory=/tmp
set guifont=Monaco:h8
set guioptions-=T
set errorfile=/tmp/rutkowsk.errors.log
set ic
set fileformats=dos,unix,mac
highlight StatusLineNC guifg=#ff0000 guibg=#000000
highlight StatusLine guifg=#00ff00 guibg=#000000
set hls
hi Normal guibg=black guifg=white
hi Search guibg=white guifg=black
hi IncSearch guibg=white guifg=black
set tags=./tags
set mousef
syntax on
set tabstop=2
set shiftwidth=2
set expandtab
set number
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment