.gitconfig 759 B

1234567891011121314151617181920212223242526272829303132333435363738
  1. ##
  2. ## To activate this configuration (recommended), add the following include
  3. ## section to your .git/config file (without the # characters).
  4. ##
  5. ## [include]
  6. ## path = ../.gitconfig
  7. ##
  8. ##
  9. ## Set a better diff hunk header filter that ignores function comments.
  10. ##
  11. [diff "cpp"]
  12. xfuncname = "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:[[:space:]]*($|/[/*])\n!:$\n^((::[[:space:]]*)?[A-Za-z_].*)$"
  13. [grep]
  14. linenumber = true
  15. ##
  16. ## Always rebase when pulling, since we don't like merge commits.
  17. ##
  18. [pull]
  19. rebase = true
  20. ##
  21. ## Show the nice stat graph when doing git pull, which now defaults to rebase.
  22. ##
  23. [rebase]
  24. stat = true
  25. ##
  26. ## Set up windiff as a guitool. To activate this, set diff.guitool to windiff.
  27. ##
  28. [difftool "windiff"]
  29. cmd = windiff $LOCAL $REMOTE