Skip to content

Instantly share code, notes, and snippets.

@macmladen
Last active August 5, 2016 05:39
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 macmladen/6f9c811dcdb3e57d2a6a to your computer and use it in GitHub Desktop.
Save macmladen/6f9c811dcdb3e57d2a6a to your computer and use it in GitHub Desktop.
[user]
name = MacMladen iMac
email = mladen@bluefish.rs
[color]
ui = on
[core]
excludesfile = /Users/mladen/.gitignore_global
whitespace= fix,-indent-with-non-tab,-indent-with-tab,trailing-space,cr-at-eol
excludesfile = ~/.gitignore_global
[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
keepBackup = FALSE
[alias]
df = !git diff --no-prefix && git diff --staged --no-prefix
clear = reset --hard
st = status
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
co = checkout
con = checkout -b
ci = commit -am
c = commit -m
br = branch
ls = branch -a
rs = remote show origin
lgs = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cd) %C(bold blue)<%an>%Creset' --abbrev-commit --date=short --no-merges --committer MacMladen
pr = pull --rebase
[push]
default = simple
[branch "master"]
mergeoptions = --no-ff
[branch "develop"]
mergeoptions = --no-ff
[push]
default = current
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
# Ignore backups and archives
*~
*.bak
*-bak
*.sql
*.sql.gz
*.tar
*.gz
*.tgz
# Ignore .htaccess
# .htaccess
# .htpasswd
# htusers
# Ignore Compass temp & devel files
.sass-cache
*.css.map
# Server files
awstats-icon
awstatsicons
icon
# Mac OS X specific files
.DS_Store
._*
.AppleDouble
.LSOverride
Icon
# Files that might appear on external disk
.Spotlight-V100
.Trashes
# Thumbnails
Thumbs.db
# Ignore CTags
.tags*
# IDE files
.buildpath
.project
.settings
.cache
.idea
*.sublime-*
.directory
# Phpmyadmin
phpmyadmin
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment