[gitg] (6 commits) Non-fast-forward update to branch wip/albfan/gitattributes-textconv

[Alberto Fanjul <albfan src gnome org>]

The branch 'wip/albfan/gitattributes-textconv' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  83c8155... Side by side diff text renderers
  d82ab68... Convert to text using gitattributes config

Commits added to the branch:

  aa4677a... Updated Spanish translation (*)
  30692b4... Update Indonesian translation (*)
  1b863bc... Update Basque translation (*)
  9dfef5c... Read setup for smart commits from git config (*)
  adfc2fb... Side by side diff text renderers
  0bb010c... Convert to text using gitattributes config

(*) This commit already existed in another branch; no separate mail sent