Advertisement
Guest User

Untitled

a guest
Jun 27th, 2017
190
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. [diff]
  2.         tool = p4merge
  3.         external = git-difftool--helper
  4.         prompt = false
  5. [difftool "p4merge"]
  6.         cmd = p4merge.exe \"$LOCAL\" \"$REMOTE\"
  7.  
  8. [merge]
  9.        tool = p4merge
  10. [mergetool "p4merge"]
  11.        cmd = p4merge.exe $BASE $LOCAL $REMOTE $MERGED
  12. [color]
  13.        branch = auto
  14.        status = auto
  15.        diff = auto
  16.        ui = auto
  17. [color]
  18.    branch = auto
  19.    diff = auto
  20.    status = auto
  21.    interactive = auto
  22.    ui = true
  23.    pager = true
  24. [color "branch"]
  25.    current = yellow reverse
  26.    local = yellow
  27.    remote = green
  28. [color "diff"]
  29.        meta = yellow bold
  30.        frag = magenta bold
  31.        old = red bold
  32.        new = green bold
  33. [color "status"]
  34.        added = yellow
  35.        changed = green
  36.        untracked = cyan
  37. [alias]
  38.        st = status
  39.        ci = commit
  40.        br = branch
  41.        df = diff
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement