summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-30 15:45:43 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-30 15:45:43 -0700
commit7a3187eb788854ed3a20fee30b27e68430f753b7 (patch)
treed31d59f4994233e39e1b3ff4ea58fac5aa5c4fb3 /Documentation
parentc1182d9297c2486d36bf7a49a31bb3d7c2f98a9b (diff)
parent43d11f4492ebafdabd3fb0c9bcab49d2731e4676 (diff)
downloadgit-7a3187eb788854ed3a20fee30b27e68430f753b7.tar.gz
Merge branch 'maint'
* maint: Start preparing for 1.8.3.3 check-ignore doc: fix broken link to ls-files page test: spell 'ls-files --delete' option correctly in test descriptions
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.8.3.3.txt11
-rw-r--r--Documentation/git-check-ignore.txt2
2 files changed, 12 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.8.3.3.txt b/Documentation/RelNotes/1.8.3.3.txt
new file mode 100644
index 0000000000..58a570ef3d
--- /dev/null
+++ b/Documentation/RelNotes/1.8.3.3.txt
@@ -0,0 +1,11 @@
+Git v1.8.3.3 Release Notes
+==========================
+
+Fixes since v1.8.3.2
+--------------------
+
+ * Mac OS X does not like to write(2) more than INT_MAX number of
+ bytes; work it around by chopping write(2) into smaller pieces.
+
+ * Newer MacOS X encourages the programs to compile and link with
+ their CommonCrypto, not with OpenSSL.
diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt
index 8e1f7ab7ea..d2df487aa2 100644
--- a/Documentation/git-check-ignore.txt
+++ b/Documentation/git-check-ignore.txt
@@ -102,7 +102,7 @@ SEE ALSO
--------
linkgit:gitignore[5]
linkgit:gitconfig[5]
-linkgit:git-ls-files[5]
+linkgit:git-ls-files[1]
GIT
---