Re: Diffs for submodule conflicts during rebase usually empty

2014-09-12 Thread Edward Z. Yang
Hello Jens, Excerpts from Jens Lehmann's message of 2014-09-11 15:29:28 -0400: Git does know what's going on, just fails to display it properly in the diff, as the output of ls-files shows: $git ls-files -u 16 6a6e215138b7f343fba67ba1b6ffc152019c6085 1b 16

git-new-workdir submodules interact poorly with core.worktree

2014-09-12 Thread Edward Z. Yang
tl;dr You can't git-new-workdir checkouts which use core.worktree. This is unfortunate because 'git submodule init' uses core.worktree by default, which means you can't recursively git-new-workdir without a hack. In the beginning, the Developer created the remote Git repository and the