diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-07 01:49:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-07 01:49:58 -0700 |
| commit | e0e324a4dc18a4341e1320a7cfac9733d81f8b0b (patch) | |
| tree | c7847d99b6ae642e96e1e512ab116c7d9daa7e26 /diffcore.h | |
| parent | f258475a6ede3617ae768b69e33f78cbab8312de (diff) | |
| download | git-e0e324a4dc18a4341e1320a7cfac9733d81f8b0b.tar.gz | |
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>
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diffcore.h b/diffcore.h index 05985147ea..eef17c4ca2 100644 --- a/diffcore.h +++ b/diffcore.h @@ -27,7 +27,7 @@ struct diff_filespec { char *path; void *data; void *cnt_data; - const void *hunk_header_ident; + const char *funcname_pattern_ident; unsigned long size; int xfrm_flags; /* for use by the xfrm */ unsigned short mode; /* file mode */ |