]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c47372d 3decb8e)
Merge git://repo.or.cz/git-gui
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Jun 2014 20:44:11 +0000 (13:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Jun 2014 20:44:11 +0000 (13:44 -0700)
commitad1c66033e7fa8166825662a56793abedf917d73
tree93a16151f9444ade412c24b3ca25136ee554446btree | snapshot
parentc47372d3a8a9fb7892cc1aa5cc5df7b6c1e61751commit | diff
parent3decb8e0ac5d951f0a0cf6e604790b471aef22e1commit | diff
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
git-gui/git-gui.sh diff1 | diff2 | blob | history
git-gui/lib/diff.tcl diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.