ignore submodule updates in diff

this avoids that we blow up on submodule updates inside merges.

Change-Id: I5608554ae4991b379219199c32e2394c3a0b1518
Reviewed-by: Orgad Shaneh <orgads@gmail.com>