From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Jun 2014 20:44:11 +0000 (-0700)
Subject: Merge git://repo.or.cz/git-gui
X-Git-Tag: v2.1.0-rc0~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad1c66033e7fa8166825662a56793abedf917d73;p=git

Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: tolerate major version changes when comparing the git version
  git-gui: show staged submodules regardless of ignore config
---

ad1c66033e7fa8166825662a56793abedf917d73