Advertisement
Guest User

Untitled

a guest
May 31st, 2016
65
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.09 KB | None | 0 0
  1. [core]
  2. autocrlf = true
  3. excludesfile = F:\\GitHub\\.gitignore
  4. ignorecase = false
  5. editor = notepad
  6. [difftool "diffmerge"]
  7. cmd = 'F:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' \"$LOCAL\" \"$REMOTE\"
  8. [mergetool "diffmerge"]
  9. cmd = 'F:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' -merge -result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
  10. trustExitCode = true
  11. [diff]
  12. renames = copies
  13. [filter "hawser"]
  14. clean = git hawser clean %f
  15. smudge = git hawser smudge %f
  16. required = true
  17. [filter "lfs"]
  18. clean = git-lfs clean -- %f
  19. smudge = git-lfs smudge -- %f
  20. required = true
  21. [merge]
  22. tool = diffmerge
  23. [difftool "diffmerge"]
  24. cmd = diffmerge $LOCAL $REMOTE
  25. [mergetool "diffmerge"]
  26. trustExitCode = true
  27. [alias]
  28. st = status
  29. slog = log --oneline
  30. cm = commit -m
  31. cma = commit -a -m
  32. fixup = commit --fixup
  33. amend = commit --amend --no-edit
  34. tog = checkout -
  35. aa = add -A
  36. co = checkout
  37. cb = checkout -b
  38. rc = rebase --continue
  39. ra = rebase --abort
  40. [rerere]
  41. enabled = false
  42. [push]
  43. default = current
  44. [credential]
  45. helper = wincred
  46. [ghfw]
  47. disableverification = true
  48. [mergetool]
  49. keepBackup = false
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement