Skip to content

Instantly share code, notes, and snippets.

@itsff
Created April 3, 2019 03:20
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 itsff/3ac00ed1600f66fe83a88d22e23f5ffe to your computer and use it in GitHub Desktop.
Save itsff/3ac00ed1600f66fe83a88d22e23f5ffe to your computer and use it in GitHub Desktop.
My gitconfig file
[user]
name = Filip Frącz
email = filip@seedcx.com
username = filip
[core]
editor = emacsclient --tty --create-frame
#editor = vim
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[push]
default = current
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
[merge]
tool = meld
[mergetool "meld"]
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
# Alteratively:
# cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
[color]
ui = auto
[color "branch"]
current = yellow bold
local = green bold
remote = cyan bold
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = green bold
changed = yellow bold
untracked = red bold
[alias]
co = checkout
b = branch
c = commit
ca = commit --amend
can = commit --amend --no-edit
cod = "!git fetch && git checkout origin/develop && git co -b "
sub = !git submodule init && git submodule update --remote
cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 git branch -d"
f = fetch --all
rb = rebase --interactive
rba = rebase --abort
rbc = rebase --continue
l = log --oneline
lg = log --oneline --graph --decorate
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment