Git config配置分享

[core]
        editor = vim


[color]
        ui = auto


[user]
        name = zhangji
        email = zhangji@smartisan.cn


[alias]
        co=checkout
        cio=commit
        ci=commit -a -s
        br=branch
        st=status
        cp=cherry-pick
        cr=cherry
        rb=rebase
        fp=format-patch
        hist=log --pretty=format:\"%Cred%h %Cblue%ad %Cred| %Creset%s%d %Cgreen[%an]\" --graph --date=short
        flog=log --pretty=fuller --graph


[DIFF]
        tool = meld


[am]
        keepcr = true


[log]
        date = local
[merge]
conflictstyle = merge
tool = meld
[mergetool]
keepBackup = false
[mergetool "meld"]
cmd = meld $LOCAL $MERGED $REMOTE\n