path: root/Documentation
diff options
authorJunio C Hamano <>2008-02-29 08:00:09 (GMT)
committerJunio C Hamano <>2008-02-29 08:00:09 (GMT)
commit25c4f61c51a91051dcba3b8bbbac4c61aa69cc19 (patch)
tree3c5dfb372ebed51da95d0a096143c63e6c277a26 /Documentation
parent42be5cc61202014d4f1df61f9791067191f9393d (diff)
parent9907721501e19758e64bcce6d3b140316c9307b9 (diff)
Merge branch 'maint'
* maint: templates/Makefile: don't depend on local umask setting Correct name of diff_flush() in API documentation Start preparing for Conflicts: RelNotes
Diffstat (limited to 'Documentation')
2 files changed, 27 insertions, 1 deletions
diff --git a/Documentation/RelNotes- b/Documentation/RelNotes-
new file mode 100644
index 0000000..5bfdb35
--- /dev/null
+++ b/Documentation/RelNotes-
@@ -0,0 +1,26 @@
+GIT v1.5.4.4 Release Notes
+Fixes since v1.5.4.3
+ * "git cvsexportcommit -w $cvsdir" misbehaved when GIT_DIR is set to a
+ relative directory.
+ * "git http-push" had an invalid memory access that could lead it to
+ segfault.
+ * When "git rebase -i" gave control back to the user for a commit that is
+ marked to be edited, it just said "modify it with commit --amend",
+ without saying what to do to continue after modifying it. Give an
+ explicit instruction to run "rebase --continue" to be more helpful.
+ * "git send-email" in issued a bogus empty In-Reply-To: header.
+Also included are a handful documentation updates.
+exec >/var/tmp/1
+echo O=$(git describe maint)
+git shortlog --no-merges $O..maint
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