Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- [diff]
- tool = p4merge
- external = git-difftool--helper
- prompt = false
- [difftool "p4merge"]
- cmd = p4merge.exe \"$LOCAL\" \"$REMOTE\"
- [merge]
- tool = p4merge
- [mergetool "p4merge"]
- cmd = p4merge.exe $BASE $LOCAL $REMOTE $MERGED
- [color]
- branch = auto
- status = auto
- diff = auto
- ui = auto
- [color]
- branch = auto
- diff = auto
- status = auto
- interactive = auto
- ui = true
- pager = true
- [color "branch"]
- current = yellow reverse
- local = yellow
- remote = green
- [color "diff"]
- meta = yellow bold
- frag = magenta bold
- old = red bold
- new = green bold
- [color "status"]
- added = yellow
- changed = green
- untracked = cyan
- [alias]
- st = status
- ci = commit
- br = branch
- df = diff
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement