summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorAndreas Ericsson <ae@op5.se>2008-09-07 20:15:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-09-07 22:22:24 (GMT)
commitaf9ce1ffc6de9774e90a91f27fb1febd027f74f1 (patch)
tree494653079c09661aea964bde5a8723240fa67beb /Documentation/gitattributes.txt
parentec3a4ba519c0012d58584d23f407c302e7b80eb6 (diff)
downloadgit-af9ce1ffc6de9774e90a91f27fb1febd027f74f1.zip
git-af9ce1ffc6de9774e90a91f27fb1febd027f74f1.tar.gz
git-af9ce1ffc6de9774e90a91f27fb1febd027f74f1.tar.bz2
Teach "git diff -p" to locate PHP class methods
Otherwise it will always print the class-name rather than the name of the function inside that class. While we're at it, reorder the gitattributes manpage to list the built-in funcname pattern names in alphabetical order. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 5fb5007..75124d2 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -311,18 +311,20 @@ patterns are available:
- `bibtex` suitable for files with BibTeX coded references.
+- `html` suitable for HTML/XHTML documents.
+
- `java` suitable for source code in the Java lanugage.
- `pascal` suitable for source code in the Pascal/Delphi language.
+- `php` suitable for source code in the PHP language.
+
- `python` suitable for source code in the Python language.
- `ruby` suitable for source code in the Ruby language.
- `tex` suitable for source code for LaTeX documents.
-- `html` suitable for HTML/XHTML documents.
-
Performing a three-way merge
~~~~~~~~~~~~~~~~~~~~~~~~~~~~