diff options
authorJunio C Hamano <>2015-01-12 22:08:42 (GMT)
committerJunio C Hamano <>2015-01-12 22:08:42 (GMT)
commitdef6dd9bc67725f3d35d1a18f67c395c107cee0a (patch)
parent832258da969fbedbbd1d474900dbdbdf23d4bca1 (diff)
parentfdf96a20acf96a6ac538df8113b2aafd6ed71d50 (diff)
Sync with 2.2.2
2 files changed, 32 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.2.2.txt b/Documentation/RelNotes/2.2.2.txt
index 29e1a3b..b19a35d 100644
--- a/Documentation/RelNotes/2.2.2.txt
+++ b/Documentation/RelNotes/2.2.2.txt
@@ -30,4 +30,34 @@ Fixes since v2.2.1
* The build procedure did not bother fixing perl and python scripts
when NO_PERL and NO_PYTHON build-time configuration changed.
+ * The code that reads the reflog from the newer to the older entries
+ did not handle an entry that crosses a boundary of block it uses to
+ read them correctly.
+ * "git apply" was described in the documentation to take --ignore-date
+ option, which it does not.
+ * Traditionally we tried to avoid interpreting date strings given by
+ the user as future dates, e.g. GIT_COMMITTER_DATE=2014-12-10 when
+ used early November 2014 was taken as "October 12, 2014" because it
+ is likely that a date in the future, December 10, is a mistake.
+ This heuristics has been loosened to allow people to express future
+ dates (most notably, --until=<date> may want to be far in the
+ future) and we no longer tiebreak by future-ness of the date when
+ (1) ISO-like format is used, and
+ (2) the string can make sense interpreted as both y-m-d and y-d-m.
+ Git may still have to use the heuristics to tiebreak between dd/mm/yy
+ and mm/dd/yy, though.
+ * The code to abbreviate an object name to its short unique prefix
+ has been optimized when no abbreviation was requested.
+ * "git add --ignore-errors ..." did not ignore an error to
+ give a file that did not exist.
+ * Git did not correctly read an overlong refname from a packed refs
+ file.
Also contains typofixes, documentation updates and trivial code clean-ups.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 1796151..9d33431 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v2.2.1/git.html[documentation for release 2.2.1]
+* link:v2.2.2/git.html[documentation for release 2.2.2]
* release notes for
+ link:RelNotes/2.2.2.txt[2.2.2],