From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Oct 2011 10:01:44 +0000 (-0700)
Subject: Merge git://repo.or.cz/git-gui
X-Git-Tag: v1.7.8-rc0~67
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=47d45a5ebd5bce543a50546d05e8b92c6971acda;p=git.git

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

* git://repo.or.cz/git-gui:
  git-gui: incremental goto line in blame view
  git-gui: clear the goto line input when hiding
  git-gui: only accept numbers in the goto-line input
  git-gui: search and linenumber input are mutual exclusive in the blame view
  git-gui: deal with unknown files when pressing the "Stage Changed" button
  git-gui: drop the 'n' and 'Shift-n' bindings from the last patch.
  git-gui: Add keyboard shortcuts for search and goto commands in blame view.
  git-gui: Enable jumping to a specific line number in blame view.
  Fix tooltip display with multiple monitors on windows.
  Fix typo: existant->existent
  git-gui: updated translator README for current procedures.
  git-gui: warn when trying to commit on a detached head
  git-gui: Corrected a typo in the Swedish translation of 'Continue'
---

47d45a5ebd5bce543a50546d05e8b92c6971acda
diff --cc git-gui/lib/line.tcl
index 000000000,c160012de..c160012de
mode 000000,100644..100644
--- a/git-gui/lib/line.tcl
+++ b/git-gui/lib/line.tcl