diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-12-08 14:13:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-08 14:13:52 -0800 |
| commit | fa5f2398e5163f855b0a680b0bf704e2c2e7da24 (patch) | |
| tree | a87e63fbd7424b4814c21c26c8f9d976ea00a89c /Documentation | |
| parent | e5da8655b23737a8449868e1d99973a8d0e25fe3 (diff) | |
| parent | bdfc6b364a51b19efbacbd46fcef5be41a5db50e (diff) | |
| download | git-fa5f2398e5163f855b0a680b0bf704e2c2e7da24.tar.gz git-fa5f2398e5163f855b0a680b0bf704e2c2e7da24.tar.xz | |
Sync with 2.6.4
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/2.6.4.txt | 15 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.6.4.txt b/Documentation/RelNotes/2.6.4.txt index 621eb953b..b0256a2dc 100644 --- a/Documentation/RelNotes/2.6.4.txt +++ b/Documentation/RelNotes/2.6.4.txt @@ -44,5 +44,20 @@ Fixes since v2.6.3 computing the object name of the target of symbolic link, which may not even exist or may be a directory. + * There was no way to defeat a configured rebase.autostash variable + from the command line, as "git rebase --no-autostash" was missing. + + * Allow "git interpret-trailers" to run outside of a Git repository. + + * Produce correct "dirty" marker for shell prompts, even when we + are on an orphan or an unborn branch. + + * Some corner cases have been fixed in string-matching done in "git + status". + + * Apple's common crypto implementation of SHA1_Update() does not take + more than 4GB at a time, and we now have a compile-time workaround + for it. + Also contains typofixes, documentation updates and trivial code clean-ups. diff --git a/Documentation/git.txt b/Documentation/git.txt index 900272b1c..cbf157be4 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.6.3/git.html[documentation for release 2.6.3] +* link:v2.6.4/git.html[documentation for release 2.6.4] * release notes for + link:RelNotes/2.6.4.txt[2.6.4], link:RelNotes/2.6.3.txt[2.6.3], link:RelNotes/2.6.2.txt[2.6.2], link:RelNotes/2.6.1.txt[2.6.1], |