Skip to content

Instantly share code, notes, and snippets.

@congnt24
Created March 11, 2016 02:57
Show Gist options
  • Save congnt24/077d9cde90f83e8d5403 to your computer and use it in GitHub Desktop.
Save congnt24/077d9cde90f83e8d5403 to your computer and use it in GitHub Desktop.
Git config use for command-line
[user]
name = Nguyen Trung Cong
email = congnt24@gmail.com
[color]
ui = true
[merge]
tool = meld
conflictstyle = diff3
[mergetool "mymeld"]
cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $MERGED $REMOTE
[diff]
tool = meld
guitool = meld
[alias]
s = status
c = checkout
b = branch
h = log --pretty=format:'%Cblue%h %Cgreen %ar%Creset %s'
l = log --decorate --oneline
current-branch = rev-parse --symbolic-full-name --abbrev-ref HEAD
p = !git push origin HEAD:$(git current-branch)
follow = !git branch -u origin/$(git current-branch)
[mergetool "meld"]
path = C:\\Program Files (x86)\\Meld\\Meld.exe
[difftool "meld"]
path = C:\\Program Files (x86)\\Meld\\Meld.exe
[difftool]
prompt = false
[core]
autocrlf = true
[status]
color = auto
[push]
default = upstream
[pager]
color = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment