diff options
author | Jens Lehmann <Jens.Lehmann@web.de> | 2014-01-07 22:31:32 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-01-07 14:33:04 -0800 |
commit | 1cbd18300a8755ba46791b2aa6249fa537a1d651 (patch) | |
tree | fc770d1d8fbd67441ec085435995554187d54031 /Documentation/git-mergetool--lib.txt | |
parent | Merge branch 'maint' (diff) | |
download | tgif-1cbd18300a8755ba46791b2aa6249fa537a1d651.tar.xz |
mv: better document side effects when moving a submodule
The "Submodules" section of the "git mv" documentation mentions what will
happen when a submodule with a gitfile gets moved with newer git. But it
doesn't talk about what happens when the user changes between commits
before and after the move, which does not update the work tree like using
the mv command did the first time.
Explain what happens and what the user has to do manually to fix that in
the new BUGS section. Also document this behavior in a new test.
Reported-by: George Papanikolaou <g3orge.app@gmail.com>
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions