diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-06-12 16:57:55 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-06-13 10:47:13 -0700 |
| commit | b2453d34496cb62b9c63c7a7c9b4bead2431f715 (patch) | |
| tree | 4752c958b2581f46e769d602161c56cc485da167 /Documentation/RelNotes | |
| parent | RelNotes 2.18: typofixes (diff) | |
| download | tgif-b2453d34496cb62b9c63c7a7c9b4bead2431f715.tar.xz | |
RelNotes 2.18: clarify where directory rename detection applies
Mention that this feature works with some commands (merge and cherry-pick,
implying that it also works with commands that build on these like rebase
-m and rebase -i). Explicitly mentioning two commands hopefully implies
that it may not always work with other commands (am, and rebase without
flags that imply either -m or -i).
Also, since the directory rename detection from this cycle was
specifically added in merge-recursive and not diffcore-rename, remove the
'in "diff" family" phrase from the note. (Folks have requested in the
past that `git diff` detect directory renames and somehow simplify its
output, so it may be helpful to avoid implying that diff has any new
capability here.)
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes')
| -rw-r--r-- | Documentation/RelNotes/2.18.0.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.18.0.txt b/Documentation/RelNotes/2.18.0.txt index ed80e5485b..449e49e0eb 100644 --- a/Documentation/RelNotes/2.18.0.txt +++ b/Documentation/RelNotes/2.18.0.txt @@ -6,7 +6,7 @@ Updates since v2.17 UI, Workflows & Features - * Rename detection logic in "diff" family that is used in "merge" has + * Rename detection logic that is used in "merge" and "cherry-pick" has learned to guess when all of x/a, x/b and x/c have moved to z/a, z/b and z/c, it is likely that x/d added in the meantime would also want to move to z/d by taking the hint that the entire directory |