From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Sep 2012 22:54:17 +0000 (-0700)
Subject: Merge branch 'sz/submodule-force-update'
X-Git-Tag: v1.8.0-rc0~109
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=81dbbf72406c47b5199a59c6b83338b11fd3e754;p=git.git

Merge branch 'sz/submodule-force-update'

"git submodule update --force" used to leave the working tree of the
submodule intact when there were local changes.  It is more intiutive
to make "--force" a sign to run "checkout -f" to overwrite them.

* sz/submodule-force-update:
  Make 'git submodule update --force' always check out submodules.
---

81dbbf72406c47b5199a59c6b83338b11fd3e754