summaryrefslogtreecommitdiff
path: root/url.c
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-12-07 18:51:20 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-12-09 09:21:23 +0900
commita8f5a59067073a8e5d4949e288a1bc8757109065 (patch)
treeff958a9a212d6055bf4079508de70e22bd04bf8e /url.c
parentMerge branch 'es/format-patch-range-diff-fix-fix' (diff)
downloadtgif-a8f5a59067073a8e5d4949e288a1bc8757109065.tar.xz
git-rebase.txt: update note about directory rename detection and am
In commit 6aba117d5cf7 ("am: avoid directory rename detection when calling recursive merge machinery", 2018-08-29), the git-rebase manpage probably should have also been updated to note the stronger incompatibility between git-am and directory rename detection. Update it now. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'url.c')
0 files changed, 0 insertions, 0 deletions