Skip to content
  • Junio C Hamano's avatar
    Merge git://repo.or.cz/git-gui · a8816e7b
    Junio C Hamano authored
    * git://repo.or.cz/git-gui:
      git-gui: Fixes for Mac OS X TkAqua
      git-gui: Update Russian translation
      git-gui: run post-checkout hook after clone
      git-gui: Ensure consistent usage of mergetool.keepBackup
      git-gui: fix use of undeclared variable diff_empty_count
      git-gui (Win): make starting via "Git GUI Here" on .git/ possible
      git-gui (Win): make "Explore Working Copy" more robust
      git-gui: run post-checkout hook on checkout
      git-gui: When calling post-commit hook wrong variable was cleared.
      git-gui: use `git --html-path` to get the location of installed HTML docs
      git-gui: fix deleting from the context menu with empty selection
      git-gui: minor spelling fix and string factorisation.
      git-gui: various French translation fixes
      git-gui: Fix merge conflict display error when filename contains spaces
      git-gui: don't hide the Browse button when resizing the repo chooser
      Append ampersand to "Target" of lnk files created by do_cygwin_shortcut
      git-gui: Support more git version notations.
      git-gui: Avoid an infinite rescan loop in handle_empty_diff.
      git-gui: Fix post-commit status with subject in non-locale encoding
    a8816e7b