summaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-29 08:00:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-29 08:00:09 (GMT)
commit25c4f61c51a91051dcba3b8bbbac4c61aa69cc19 (patch)
tree3c5dfb372ebed51da95d0a096143c63e6c277a26 /Documentation/technical
parent42be5cc61202014d4f1df61f9791067191f9393d (diff)
parent9907721501e19758e64bcce6d3b140316c9307b9 (diff)
downloadgit-25c4f61c51a91051dcba3b8bbbac4c61aa69cc19.zip
git-25c4f61c51a91051dcba3b8bbbac4c61aa69cc19.tar.gz
git-25c4f61c51a91051dcba3b8bbbac4c61aa69cc19.tar.bz2
Merge branch 'maint'
* maint: templates/Makefile: don't depend on local umask setting Correct name of diff_flush() in API documentation Start preparing for 1.5.4.4 Conflicts: RelNotes
Diffstat (limited to 'Documentation/technical')
-rw-r--r--Documentation/technical/api-diff.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/api-diff.txt b/Documentation/technical/api-diff.txt
index 83b007e..20b0241 100644
--- a/Documentation/technical/api-diff.txt
+++ b/Documentation/technical/api-diff.txt
@@ -39,7 +39,7 @@ Calling sequence
* Once you finish feeding the pairs of files, call `diffcore_std()`.
This will tell the diffcore library to go ahead and do its work.
-* Calling `diffcore_flush()` will produce the output.
+* Calling `diff_flush()` will produce the output.
Data structures