Merge commit 'git-gui/master'

* commit 'git-gui/master': (36 commits)
  git-gui: Change prior tree SHA-1 verification to use git_read
  git-gui: Include a space in Cygwin shortcut command lines
  git-gui: Use sh.exe in Cygwin shortcuts
  git-gui: Paper bag fix for Cygwin shortcut creation
  git-gui: Improve the Windows and Mac OS X shortcut creators
  git-gui: Teach console widget to use git_read
  git-gui: Perform our own magic shbang detection on Windows
  git-gui: Treat `git version` as `git --version`
  git-gui: Assume unfound commands are known by git wrapper
  git-gui: Correct gitk installation location
  git-gui: Always use absolute path to all git executables
  git-gui: Show a progress meter for checking out files
  git-gui: Change the main window progress bar to use status_bar
  git-gui: Extract blame viewer status bar into mega-widget
  git-gui: Allow double-click in checkout dialog to start checkout
  git-gui: Default selection to first matching ref
  git-gui: Unabbreviate commit SHA-1s prior to display
  git-gui: Refactor branch switch to support detached head
  git-gui: Refactor our ui_status_value update technique
  git-gui: Better handling of detached HEAD
  ...

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

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

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

diff --cc git-gui/lib/branch_checkout.tcl
index 0000000000000000000000000000000000000000,72c45b45541749699460de1122c711888b389403..72c45b45541749699460de1122c711888b389403
mode 000000,100644..100644
--- /dev/null
--- 2/lib/branch_checkout.tcl
+++ b/git-gui/lib/branch_checkout.tcl

diff --cc git-gui/lib/branch_create.tcl
index 0000000000000000000000000000000000000000,def615d19d6a0ba4fd76553146f29129be5baf17..def615d19d6a0ba4fd76553146f29129be5baf17
mode 000000,100644..100644
--- /dev/null
--- 2/lib/branch_create.tcl
+++ b/git-gui/lib/branch_create.tcl

diff --cc git-gui/lib/branch_delete.tcl
index 0000000000000000000000000000000000000000,c7573c6c7215cd4cd11f322ae3dba5b77b938078..c7573c6c7215cd4cd11f322ae3dba5b77b938078
mode 000000,100644..100644
--- /dev/null
--- 2/lib/branch_delete.tcl
+++ b/git-gui/lib/branch_delete.tcl

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

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

diff --cc git-gui/lib/checkout_op.tcl
index 0000000000000000000000000000000000000000,00a994be120edaa1024733cb94e3f1fe4e494039..00a994be120edaa1024733cb94e3f1fe4e494039
mode 000000,100644..100644
--- /dev/null
--- 2/lib/checkout_op.tcl
+++ b/git-gui/lib/checkout_op.tcl

diff --cc git-gui/lib/choose_rev.tcl
index 0000000000000000000000000000000000000000,afd81707ceb08ccc106e76b082f892c824dfb828..afd81707ceb08ccc106e76b082f892c824dfb828
mode 000000,100644..100644
--- /dev/null
--- 2/lib/choose_rev.tcl
+++ b/git-gui/lib/choose_rev.tcl

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

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

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

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

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

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

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

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

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

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

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

diff --cc git-gui/lib/status_bar.tcl
index 0000000000000000000000000000000000000000,72a8fe1fd36932efcb1e2f2e18e4200150436854..72a8fe1fd36932efcb1e2f2e18e4200150436854
mode 000000,100644..100644
--- /dev/null
--- 2/lib/status_bar.tcl
+++ b/git-gui/lib/status_bar.tcl

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