Am 12.09.2014 um 15:03 schrieb 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
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
Hello all,
In many situations, if you have a submodule conflict during a rebase,
and you type 'git diff' to get a summary of the situation, you will get
an empty diff. Here's a simple transcript for one such case (I'm sorry
I can't make it much shorter), tested on git version 2.0.3.693.g996b0fd:
Am 11.09.2014 um 19:50 schrieb ezyang:
Hello all,
In many situations, if you have a submodule conflict during a rebase,
and you type 'git diff' to get a summary of the situation, you will get
an empty diff. Here's a simple transcript for one such case (I'm sorry
I can't make it much shorter),
4 matches
Mail list logo