Skip to content

Instantly share code, notes, and snippets.

@evgenii
Created February 26, 2017 18:27
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 evgenii/d2dc146f88aee12f796ee36ca9dc9c0d to your computer and use it in GitHub Desktop.
Save evgenii/d2dc146f88aee12f796ee36ca9dc9c0d to your computer and use it in GitHub Desktop.
.gitconfig
[user]
name = Evgenii.S.Semenchuk
email = evgenii.s.semenchuk@gmail.com
[core]
#editor = subl -w
[merge]
tool = diffmerge
[color]
diff = auto
status = auto
branch = auto
interactive = auto
[alias]
st = status
ci = commit
ciw = commit -am "[WIP]"
cil = commit -a --amend --no-edit
unwip = reset --soft 'HEAD^'
br = branch
cbr = checkout -b
dbr = branch -D
mbr = branch -m
co = checkout
df = diff
lg = log -p
olg = log --oneline
slg = log --pretty=short
mlg = log --pretty=medium
flg = log --pretty=full
fflg = log --pretty=fuller
who = shortlog -s --
chmsg = commit --amend
up = pull origin
cdiff = diff --cached
lpatch = format-patch -n1
mpatch = format-patch -M
[difftool "diffmerge"]
cmd = diffmerge "$LOCAL" "$REMOTE"
[mergetool "diffmerge"]
cmd = diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
trustExitCode = true
[push]
default = current
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment