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

* git://repo.or.cz/git-gui:
  git-gui: Vertically align textboxes with labels
  git-gui: Handle workdir detection when CYGWIN=nowinsymlinks
  git-gui: Add a --trace command line option

diff --cc git-gui/git-gui.sh
Simple merge

diff --cc git-gui/lib/choose_repository.tcl
Simple merge