Skip to content

Instantly share code, notes, and snippets.

@scragz
Created January 14, 2011 09:25
Show Gist options
  • Save scragz/779404 to your computer and use it in GitHub Desktop.
Save scragz/779404 to your computer and use it in GitHub Desktop.
[user]
name =
email =
[color]
diff = auto
status = auto
branch = auto
interactive = 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 = red
untracked = cyan
[alias]
st = status
ci = commit
co = checkout
br = branch
df = diff
ds = diff --stat
cds = !git ds --cached
lg = log -p
ch = cherry -v origin
w = whatchanged
# http://www.jukie.net/~bart/conf/gitconfig
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
# add all changed (but not new) files to stage (index):
au = add -u
# show conflicting merge in gitk:
gitkconflict = !gitk --left-right HEAD...MERGE_HEAD
# prune all tracking local branches that have been removed from remote:
prune-all = !git remote | xargs -n 1 git remote prune
# show full history in gitk (including "deleted" branches and stashes)
history-all = !gitk --all $( git fsck | awk '/dangling commit/ {print $3}' )
# show list of contributors in descending order by number of commits
rank = shortlog -sn --no-merges
# given a string for an author, try to figure out full name and email:
whois = "!sh -c 'git log -i -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -"
# given any git object, try to show it briefly
whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short
up = !git remote update ; git gc
# Search for a given string in all patches and print commit messages
# example: search for any commit that adds or removes string "foobar"
# git searchcommits foobar
# example: search commits for string "foobar" in directory src/lib
# git searchcommits foobar src/lib
# example: search commits for "foobar", print full diff of commit with 1 line context
# git searchcommits foobar --pickaxe-all -U1 src/lib
searchcommits = "!f() { query=\"$1\"; shift; git log -S\"$query\" \"$@\"; }; f \"$@\""
[core]
excludesfile = /Users/scragz/.gitignore
legacyheaders = false
# pager = most +s +'/---'
[apply]
whitespace = fix
[diff]
renames = copy
[merge]
tool = opendiff
[repack]
usedeltabaseoffset = true
[push]
default = tracking
[github]
user =
token =
[diff "ruby"]
funcname = ^ *\\(\\(class\\|module\\|def\\) .*\\)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment