Skip to content

Instantly share code, notes, and snippets.

@lancespeelmon
Last active August 29, 2015 14:09
Show Gist options
  • Save lancespeelmon/0d2c7f5a67b0f46a0edd to your computer and use it in GitHub Desktop.
Save lancespeelmon/0d2c7f5a67b0f46a0edd to your computer and use it in GitHub Desktop.
global git config
[user]
email = foo@bar.com
name = Foo Bar
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = auto
[gc]
auto = 1
[alias]
st = status
ci = commit
co = checkout
unstage = reset HEAD
uncommit = reset --soft HEAD^
amend = commit --amend # fix last commit
outgoing = log -u origin/master..master # outgoing changes (in local, but not origin)
cp = cherry-pick -x -s
# Better log formatting
changes = log --pretty=format:'%h %cr %cn %Cgreen%s%Creset' --name-status
short = log --pretty=format:'%h %cr %cn %Cgreen%s%Creset'
filelog = log -u # show changes to a file
# changelog = log --pretty=oneline
changelog = log --pretty=format:'* %s `%h`' --no-merges
[merge]
summary = true
[core]
excludesfile = /Users/foobar/.gitignore_global
autocrlf = input
[diff]
renameLimit = 10000
[mergetool]
keepBackup = true
prompt = false
[branch]
autosetuprebase = always
[push]
default = simple
[status]
# needed for mvn release plugin: https://jira.codehaus.org/browse/SCM-740
displayCommentPrefix = true
.classpath
.project
.settings
derby.log
target
.git
m2-target
velocity.log
.externalToolBuilders
maven-eclipse.xml
.checkstyle
generated-src
# 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
*.sqlite
# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment