Last active
August 16, 2023 00:47
-
-
Save ruediger/5647207 to your computer and use it in GitHub Desktop.
A collection of additional "custom hunk header" patterns for .gitattributes. This provides better context in the diff hunk header.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
*.tex diff=tex | |
*.bib diff=bibtex | |
*.c diff=cpp | |
*.h diff=cpp | |
*.c++ diff=cpp | |
*.h++ diff=cpp | |
*.cpp diff=cpp | |
*.hpp diff=cpp | |
*.cc diff=cpp | |
*.hh diff=cpp | |
*.m diff=matlab | |
*.py diff=python | |
*.rb diff=ruby | |
*.php diff=php | |
*.pl diff=perl | |
*.html diff=html | |
*.xhtml diff=html | |
*.f diff=fortran | |
*.lisp diff=lisp | |
*.el diff=lisp | |
*.r diff=rstats | |
*.texi* diff=texinfo | |
*.org diff=orgmode | |
*.rs diff=rust | |
*.pdf diff=pdf | |
*.png diff=exif | |
*.jpg diff=exif | |
*.jpeg diff=exif | |
*.gif diff=exif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[diff "lisp"] | |
xfuncname = "^(\\(.*)$" | |
# xfuncname = "^(\\((cl-)?def(un|macro|method).*)$" | |
[diff "rstats"] | |
xfuncname = "^([a-zA-z.]+ <- function.*)$" | |
[diff "texinfo"] | |
# from http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=.gitattributes;h=c3b2926c78c939d94358cc63d051a70d38cfea5d;hb=HEAD | |
xfuncname = "^@node[ \t][ \t]*\\([^,][^,]*\\)" | |
[diff "orgmode"] | |
xfuncname = "^(\\*+.*)$" | |
#[diff "css"] | |
# xfuncname = "^([a-zA-Z#.@][^\\}]*)$" | |
# xfuncname = "^(.*\\{)$" | |
[diff "rust"] # Thanks to csabahenk | |
xfuncname = "^[ \t]*(pub|)[ \t]*((fn|struct|enum|impl|trait|mod)[^;]*)$" | |
[diff "exif"] | |
binary = true | |
# sudo apt-get install libimage-exiftool-perl | |
textconv = exiftool | |
[diff "pdf"] | |
textconv = pdftotext-stdout | |
# sudo apt-get install pdftotext | |
# copy the following to a script pdftotext-stdout somehwere in $PATH | |
# #!/bin/bash | |
# pdftotext "$@" - |
Emacs' git-modes comes with several modes for git including gitattributes-mode
and gitconfig-mode
for editing git attributes and config files.
http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c
for dealing with ChangeLog merges in git (and hg)
For javascript:
[diff "ecmascript"]
xfuncname = "^((.*function.*)|([ \t]+it\\(.*))$"
Is there c++ xfuncname ?
Further set up for diffing binary documents.
I am searching for patterns for haskell or nix. Can anyone help?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Suggested improvement: