]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/git-rebase.txt
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 965798d) | patch
git-rebase.txt: update note about directory rename detection and am
authorElijah Newren <newren@gmail.com>
Fri, 7 Dec 2018 17:51:20 +0000 (18:51 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Dec 2018 00:21:23 +0000 (09:21 +0900)
commita8f5a59067073a8e5d4949e288a1bc8757109065
treeff958a9a212d6055bf4079508de70e22bd04bf8etree | snapshot
parent965798d1f2992a4bdadb81eba195a7d465b6454acommit | diff
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>
Documentation/git-rebase.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.