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

* git://repo.or.cz/git-gui:
  git-gui: Reenable staging unmerged files by clicking the icon.
  git-gui: Support the encoding menu in gui blame.
  git-gui: Optimize encoding name resolution using a lookup table.
  git-gui: Allow forcing display encoding for diffs using a submenu.
  git-gui: Add a menu of available encodings.
  git-gui: Cleanup handling of the default encoding.
  git-gui: Assume `blame --incremental` output is in UTF-8
  git-gui: Use gitattribute "encoding" for file content display
  git-gui: Add support for calling out to the prepare-commit-msg hook
  git-gui: Hide commit related UI during citool --nocommit
  git-gui: Add more integration options to citool.
  git-gui: Updated German translation.
  git-gui: I18n fix sentence parts into full sentences for translation again.
  git-gui: Restore ability to Stage Working Copy for conflicts.
  git-gui: Fix Blame Parent & Context for working copy lines.

diff --cc git-gui/.gitattributes
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..f96112d47f743289bf3893981bc89dcaa9caae19
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/git-gui/.gitattributes
@@@ -1,0 -1,0 +1,3 @@@
++*           encoding=US-ASCII
++git-gui.sh  encoding=UTF-8
++/po/*.po    encoding=UTF-8

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

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

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

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

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

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

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

diff --cc git-gui/po/de.po
Simple merge