W dniu 18.02.2011 22:19, Matthieu Moy pisze: > Piotr Krukowiecki <piotr.krukowiecki@xxxxxxxxx> writes: > >> W dniu 18.02.2011 14:53, Matthieu Moy pisze: >>> Piotr Krukowiecki <piotr.krukowiecki@xxxxxxxxx> writes: >>> >>>> Hi, >>>> >>>> there's a different output when committing change and when merging >>>> change for a binary file. >>>> Do the insertions/deletions have any meaning for binary files? >>> >>> No. They're inserted/deleted *lines*, and that wouldn't make sense for >>> binary files. >> >> So it's a bug? > > I don't see any bug. There were no insertion/deletion in text files, > hence you see 0 for both. Maybe I wasn't clear. Both the commit and the merge was for the same binary file. In case of commit there were non-zero insertions/deletions. See example below - notice both update binary file blob.o: $ git commit -m Updated [topic 5da30ce] Updated 1 files changed, 8 insertions(+), 103 deletions(-) rewrite blob.o (100%) $ git merge topic Updating 75ab259..5da30ce Fast-forward blob.o | Bin 25920 -> 4364 bytes 1 files changed, 0 insertions(+), 0 deletions(-) Hope that helps, -- Piotr Krukowiecki -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html