diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 17:41:07 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 17:41:07 +0200 |
| commit | 1500f7bc1366e71edb7e8a31f3cf5614e9591cc2 (patch) | |
| tree | 350805ff81d52e8c3a0eb0c8d71ae78662969664 /git-gui/.gitattributes | |
| parent | Merge branch 'maint' (diff) | |
| parent | git-gui: Reenable staging unmerged files by clicking the icon. (diff) | |
| download | git-1500f7bc1366e71edb7e8a31f3cf5614e9591cc2.tar.xz git-1500f7bc1366e71edb7e8a31f3cf5614e9591cc2.zip | |
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.
Diffstat (limited to 'git-gui/.gitattributes')
| -rw-r--r-- | git-gui/.gitattributes | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-gui/.gitattributes b/git-gui/.gitattributes new file mode 100644 index 0000000000..f96112d47f --- /dev/null +++ b/git-gui/.gitattributes @@ -0,0 +1,3 @@ +* encoding=US-ASCII +git-gui.sh encoding=UTF-8 +/po/*.po encoding=UTF-8 |