summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-06-12 16:57:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-13 10:47:13 -0700
commitb2453d34496cb62b9c63c7a7c9b4bead2431f715 (patch)
tree4752c958b2581f46e769d602161c56cc485da167 /builtin/am.c
parentRelNotes 2.18: typofixes (diff)
downloadtgif-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 'builtin/am.c')
0 files changed, 0 insertions, 0 deletions