sjs/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update gitconfig

Browse source
This commit is contained in:
Sami Samhuri 2013-10-23 12:14:32 -07:00
parent 1920fb561e
commit 3ca62f0b1b
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gitconfig
View file

@ -1,6 +1,6 @@
[user] [user]
name = Sami Samhuri name = Sami Samhuri
email = sami.samhuri@gmail.com email = sami@samhuri.net
[alias] [alias]
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
co = checkout co = checkout
@ -10,9 +10,8 @@
a = add a = add
c = commit c = commit
[push] [push]
default = tracking default = upstream
[branch] [branch]
autosetuprebase = always
autosetupmerge = true autosetupmerge = true
[core] [core]
quotepath = false quotepath = false
@ -28,11 +27,14 @@
ui = auto ui = auto
[merge] [merge]
stat = true stat = true
[rebase]
autosquash = true
[difftool] [difftool]
prompt = false prompt = false
[difftool "FileMerge"] [difftool "FileMerge"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\" cmd = opendiff \"$LOCAL\" \"$REMOTE\"
[credential] [credential]
helper = osxkeychain helper = osxkeychain
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =