Advertisement
Guest User

Untitled

a guest
May 31st, 2016
63
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.07 KB | None | 0 0
  1. [user]
  2. name = [INSERT YOUR NAME HERE]
  3. email = [INSERT YOUR EMAIL ADDRESS HERE]
  4. [core]
  5. autocrlf = true
  6. # Ensure to change the path and filename below !!!!!
  7. excludesfile = D:\\Documents\\gitignore_global.txt
  8. # Ensure to change the path and filenames below !!!!!
  9. editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -nosession
  10. preloadindex = true
  11. fscache = true
  12. [diff]
  13. tool = bc3
  14. [difftool "bc3"]
  15. # Ensure to change the path and filenames below !!!!!
  16. cmd = \"c:/Program Files (x86)/Beyond Compare 3/BCompare.exe\" \"$LOCAL\" \"$REMOTE\" -lro -lefttitle='remote' -righttitle='local' -solo -expandall
  17. [difftool]
  18. prompt = false
  19. [merge]
  20. tool = bc3
  21. [mergetool "bc3"]
  22. # Ensure to change the path and filenames below !!!!!
  23. cmd = \"c:/Program Files (x86)/Beyond Compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" -ro -lefttitle='local' -centertitle='base' -righttitle='other' -automerge -reviewconflicts -solo
  24. trustExitCode = true
  25. [alias]
  26. st = status
  27. dt = difftool --dir-diff
  28. vd = difftool --dir-diff
  29. lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
  30. lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
  31. lg = !"git lg1"
  32. maint = fetch -p
  33. nm = "!f() { git branch --no-merged $1; }; f"
  34. m = "!f() { git branch --merged $1; }; f"
  35. whoami = var GIT_COMMITTER_IDENT
  36. [mergetool]
  37. keepBackup = false
  38. prompt = false
  39. [difftool "sourcetree"]
  40. # Ensure to change the path and filenames below !!!!!
  41. cmd = 'C:/Program Files (x86)/Beyond Compare 3/BComp.exe' \"$LOCAL\" \"$REMOTE\"
  42. [mergetool "sourcetree"]
  43. # Ensure to change the path and filenames below !!!!!
  44. cmd = 'C:/Program Files (x86)/Beyond Compare 3/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
  45. trustExitCode = true
  46. [push]
  47. default = simple
  48. [gc]
  49. auto = 256
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement