diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-12 20:02:18 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-12 20:02:18 +0300 |
| commit | 2376d31787760af598db23bb3982a57419854e5c (patch) | |
| tree | 5f88ebca41a7cfc2a294087a4629d2536d7c4986 | |
| parent | 2807cd7b25af07f7175751b8519f649478031f49 (diff) | |
| parent | e0c1ceafc5bece92d35773a75fff59497e1d9bd5 (diff) | |
Sync with 2.9.3
* tag 'v2.9.3':
Git 2.9.3
| -rw-r--r-- | Documentation/RelNotes/2.9.3.txt | 10 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.9.3.txt b/Documentation/RelNotes/2.9.3.txt index d19f144382..695b86f612 100644 --- a/Documentation/RelNotes/2.9.3.txt +++ b/Documentation/RelNotes/2.9.3.txt @@ -157,4 +157,14 @@ Fixes since v2.9.2 can be safely discarded without any other consideration. State that it is safe to do so. + * Not-so-recent rewrite of "git am" that started making internal + calls into the commit machinery had an unintended regression, in + that no matter how many seconds it took to apply many patches, the + resulting committer timestamp for the resulting commits were all + the same. + + * "git difftool <paths>..." started in a subdirectory failed to + interpret the paths relative to that directory, which has been + fixed. + Also contains minor documentation updates and code clean-ups. diff --git a/Documentation/git.txt b/Documentation/git.txt index f4dfc9d42c..bd659c4471 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.9.2/git.html[documentation for release 2.9.2] +* link:v2.9.3/git.html[documentation for release 2.9.3] * release notes for + link:RelNotes/2.9.3.txt[2.9.3], link:RelNotes/2.9.2.txt[2.9.2], link:RelNotes/2.9.1.txt[2.9.1], link:RelNotes/2.9.0.txt[2.9]. |