author | Junio C Hamano <gitster@pobox.com> | |
Sat, 7 Jul 2007 08:49:58 +0000 (01:49 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 7 Jul 2007 08:49:58 +0000 (01:49 -0700) | ||
commit | e0e324a4dc18a4341e1320a7cfac9733d81f8b0b | |
tree | c7847d99b6ae642e96e1e512ab116c7d9daa7e26 | tree | snapshot |
parent | f258475a6ede3617ae768b69e33f78cbab8312de | commit | diff |
Fix configuration syntax to specify customized hunk header patterns.
This updates the hunk header customization syntax. The special
case 'funcname' attribute is gone.
You assign the name of the type of contents to path's "diff"
attribute as a string value in .gitattributes like this:
*.java diff=java
*.perl diff=perl
*.doc diff=doc
If you supply "diff.<name>.funcname" variable via the
configuration mechanism (e.g. in $HOME/.gitconfig), the value is
used as the regexp set to find the line to use for the hunk
header (the variable is called "funcname" because such a line
typically is the one that has the name of the function in
programming language source text).
If there is no such configuration, built-in default is used, if
any. Currently there are two default patterns: default and java.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This updates the hunk header customization syntax. The special
case 'funcname' attribute is gone.
You assign the name of the type of contents to path's "diff"
attribute as a string value in .gitattributes like this:
*.java diff=java
*.perl diff=perl
*.doc diff=doc
If you supply "diff.<name>.funcname" variable via the
configuration mechanism (e.g. in $HOME/.gitconfig), the value is
used as the regexp set to find the line to use for the hunk
header (the variable is called "funcname" because such a line
typically is the one that has the name of the function in
programming language source text).
If there is no such configuration, built-in default is used, if
any. Currently there are two default patterns: default and java.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c | diff | blob | history | |
diffcore.h | diff | blob | history | |
t/t4018-diff-funcname.sh | diff | blob | history |