Skip to content
Find file
Fetching contributors…
Cannot retrieve contributors at this time
113 lines (106 sloc) 3.37 KB
[alias]
# View the SHA, description, and history graph of the latest 20 commits
l = log --pretty=oneline -n 20 --graph
# very pretty log
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
# very basic log
lgod = log --oneline --decorate -n 20
# View the current working tree status using the short format
s = status -s
# Diff
d = diff --patch-with-stat
# Pull in remote changes for the current repository and all its submodules
#p = !"git pull; git submodule foreach git pull origin master"
# Add all changes
a = add .
# branch
br = branch
# erase working copy changes
rz = reset --hard HEAD
# Clone a repository including all submodules
c = clone --recursive
# Commit with message
ci = commit -m
# Commit all changes
ca = !git add -A && git commit -av
# Switch to a branch
co = checkout
# Show verbose output about tags, branches or remotes
tags = tag -l
branches = branch -a
remotes = remote -v
# Credit an author on the latest commit
credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
# Undo a `git push`
undopush = push -f origin HEAD^:master
# stan's additions (i'm not sure what they all are...):
dw = diff --word-diff
dh = diff HEAD
dc = diff --cached
who = shortlog -s --
# pull or push to origin/:currentbranch
br-name = !git for-each-ref --format='%(refname:short)' `git symbolic-ref HEAD`
bpull= "!git pull --rebase origin $(git br-name)"
bpush= "!git push origin $(git br-name)"
# commits about to be pushed
lpush = "!git --no-pager log origin/$(git br-name)..HEAD --oneline"
# commits about to be pulled
lpull = "!git --no-pager log HEAD..origin/$(git br-name) --oneline"
# diff about to be pushed
dpush = "!git diff origin/$(git br-name)...HEAD"
# diff about to be pulled
dpull = "!git diff HEAD...origin/$(git br-name)"
[apply]
# Detect whitespace errors when applying a patch
whitespace = fix
[core]
# Use custom `.gitignore` and `.gitattributes`
excludesfile = ~/.gitignore
attributesfile = ~/.gitattributes
# Treat spaces before tabs, lines that are indented with 8 or more spaces, and all kinds of trailing whitespace as an error
whitespace = space-before-tab,trailing-space
# set default editor to vim
editor = vim
[color]
# Use colors in Git commands that are capable of colored output when outputting to the terminal
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
[merge]
# Include summaries of merged commits in newly created merge commit messages
#log = true
# Use `origin` as the default remote on the `master` branch in all cases
[branch "master"]
remote = origin
merge = refs/heads/master
# URL shorthands
[url "git@github.com:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
insteadOf = "github:"
[url "git@gist.github.com:"]
insteadOf = "gst:"
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"]
insteadOf = "gist:"
[github]
user = czzarr
[user]
email = stanislas.marion@gmail.com
name = Stanislas Marion
[credential]
helper = osxkeychain
Jump to Line
Something went wrong with that request. Please try again.