From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 Jul 2007 21:14:51 +0000 (-0700)
Subject: Merge commit 'git-gui/master'
X-Git-Tag: v1.5.3-rc1~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b9dcf846e20ed5287e239c9a0942c5d150081bab;p=git.git

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
  ...
---

b9dcf846e20ed5287e239c9a0942c5d150081bab
diff --cc git-gui/lib/branch_checkout.tcl
index 000000000,72c45b455..72c45b455
mode 000000,100644..100644
--- a/git-gui/lib/branch_checkout.tcl
+++ b/git-gui/lib/branch_checkout.tcl
diff --cc git-gui/lib/branch_create.tcl
index 000000000,def615d19..def615d19
mode 000000,100644..100644
--- a/git-gui/lib/branch_create.tcl
+++ b/git-gui/lib/branch_create.tcl
diff --cc git-gui/lib/branch_delete.tcl
index 000000000,c7573c6c7..c7573c6c7
mode 000000,100644..100644
--- a/git-gui/lib/branch_delete.tcl
+++ b/git-gui/lib/branch_delete.tcl
diff --cc git-gui/lib/checkout_op.tcl
index 000000000,00a994be1..00a994be1
mode 000000,100644..100644
--- a/git-gui/lib/checkout_op.tcl
+++ b/git-gui/lib/checkout_op.tcl
diff --cc git-gui/lib/choose_rev.tcl
index 000000000,afd81707c..afd81707c
mode 000000,100644..100644
--- a/git-gui/lib/choose_rev.tcl
+++ b/git-gui/lib/choose_rev.tcl
diff --cc git-gui/lib/status_bar.tcl
index 000000000,72a8fe1fd..72a8fe1fd
mode 000000,100644..100644
--- a/git-gui/lib/status_bar.tcl
+++ b/git-gui/lib/status_bar.tcl