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

* git://repo.or.cz/git-gui: (96 commits)
  git-gui 0.9.0
  git-gui: Bind Meta-T for "Stage To Commit" menu action
  git-gui: Allow users to set font weights to bold
  git-gui: Update Japanese strings (part 2)
  git-gui: Update Japanese strings
  Updated russian translation of git-gui
  po2msg: actually output statistics
  po2msg: ignore untranslated messages
  po2msg: ignore entries marked with "fuzzy"
  git-gui: Protect against bad translation strings
  git-gui: Make sure we get errors from git-update-index
  More updates and corrections to the russian translation of git-gui
  Updated Russian translation.
  git-gui: Update German translation
  git-gui: Add more terms to glossary.
  git-gui: Paper bag fix the global config parsing
  git-gui: Honor a config.mak in git-gui's top level
  git-gui: Collapse $env(HOME) to ~/ in recent repositories on Windows
  git-gui: Support cloning Cygwin based work-dirs
  git-gui: Use proper Windows shortcuts instead of bat files
  ...

diff --cc git-gui/.gitignore
index 020b86d,0000000..6483b21
mode 100644,000000..100644
--- 1/git-gui/.gitignore
--- /dev/null
+++ b/git-gui/.gitignore
@@@ -1,5 -1,0 +1,8 @@@
- git-citool
++.DS_Store
++config.mak
++Git Gui.app*
++git-gui.tcl
 +GIT-VERSION-FILE
 +GIT-GUI-VARS
 +git-gui
 +lib/tclIndex

diff --cc git-gui/GIT-VERSION-GEN
index 9770b0b,0000000..cfe46a8
mode 100755,000000..100755
--- 1/git-gui/GIT-VERSION-GEN
--- /dev/null
+++ b/git-gui/GIT-VERSION-GEN
@@@ -1,80 -1,0 +1,80 @@@
- DEF_VER=0.8.GITGUI
 +#!/bin/sh
 +
 +GVF=GIT-VERSION-FILE
++DEF_VER=0.9.GITGUI
 +
 +LF='
 +'
 +
 +tree_search ()
 +{
 +      head=$1
 +      tree=$2
 +      for p in $(git rev-list --parents --max-count=1 $head 2>/dev/null)
 +      do
 +              test $tree = $(git rev-parse $p^{tree} 2>/dev/null) &&
 +              vn=$(git describe --abbrev=4 $p 2>/dev/null) &&
 +              case "$vn" in
 +              gitgui-[0-9]*) echo $vn; break;;
 +              esac
 +      done
 +}
 +
 +# Always use the tarball version file if found, just
 +# in case we are somehow contained in a larger git
 +# repository that doesn't actually track our state.
 +# (At least one package manager is doing this.)
 +#
 +# We may be a subproject, so try looking for the merge
 +# commit that supplied this directory content if we are
 +# not at the toplevel.  We probably will always be the
 +# second parent in the commit, but we shouldn't rely on
 +# that fact.
 +#
 +# If we are at the toplevel or the merge assumption fails
 +# try looking for a gitgui-* tag.
 +
 +if test -f version &&
 +   VN=$(cat version)
 +then
 +      : happy
 +elif prefix="$(git rev-parse --show-prefix 2>/dev/null)"
 +   test -n "$prefix" &&
 +   head=$(git rev-list --max-count=1 HEAD -- . 2>/dev/null) &&
 +   tree=$(git rev-parse --verify "HEAD:$prefix" 2>/dev/null) &&
 +   VN=$(tree_search $head $tree)
 +   case "$VN" in
 +   gitgui-[0-9]*) : happy ;;
 +   *) (exit 1) ;;
 +   esac
 +then
 +      VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
 +elif VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
 +   case "$VN" in
 +   gitgui-[0-9]*) : happy ;;
 +   *) (exit 1) ;;
 +   esac
 +then
 +      VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
 +else
 +      VN="$DEF_VER"
 +fi
 +
 +dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty=
 +case "$dirty" in
 +'')
 +      ;;
 +*)
 +      VN="$VN-dirty" ;;
 +esac
 +
 +if test -r $GVF
 +then
 +      VC=$(sed -e 's/^GITGUI_VERSION = //' <$GVF)
 +else
 +      VC=unset
 +fi
 +test "$VN" = "$VC" || {
 +      echo >&2 "GITGUI_VERSION = $VN"
 +      echo "GITGUI_VERSION = $VN" >$GVF
 +}

diff --cc git-gui/Makefile
index 18e6750,0000000..e860319
mode 100644,000000..100644
--- 1/git-gui/Makefile
--- /dev/null
+++ b/git-gui/Makefile
@@@ -1,185 -1,0 +1,309 @@@
- ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH))
 +all::
 +
 +# Define V=1 to have a more verbose compile.
 +#
++# Define NO_MSGFMT if you do not have msgfmt from the GNU gettext
++# package and want to use our rough pure Tcl po->msg translator.
++# TCL_PATH must be vaild for this to work.
++#
 +
 +GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 +      @$(SHELL_PATH) ./GIT-VERSION-GEN
 +-include GIT-VERSION-FILE
 +
++uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 +uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
 +
 +SCRIPT_SH = git-gui.sh
++GITGUI_MAIN := git-gui
 +GITGUI_BUILT_INS = git-citool
- RM_F      ?= rm -f
 +ALL_LIBFILES = $(wildcard lib/*.tcl)
 +PRELOAD_FILES = lib/class.tcl
++NONTCL_LIBFILES = \
++      lib/git-gui.ico \
++      $(wildcard lib/win32_*.js) \
++#end NONTCL_LIBFILES
 +
 +ifndef SHELL_PATH
 +      SHELL_PATH = /bin/sh
 +endif
 +
 +ifndef gitexecdir
 +      gitexecdir := $(shell git --exec-path)
 +endif
 +
 +ifndef sharedir
 +      sharedir := $(dir $(gitexecdir))share
 +endif
 +
 +ifndef INSTALL
 +      INSTALL = install
 +endif
 +
- REMOVE_F0  = $(RM_F) # space is required here
++RM_RF     ?= rm -rf
 +RMDIR     ?= rmdir
 +
 +INSTALL_D0 = $(INSTALL) -d -m755 # space is required here
 +INSTALL_D1 =
 +INSTALL_R0 = $(INSTALL) -m644 # space is required here
 +INSTALL_R1 =
 +INSTALL_X0 = $(INSTALL) -m755 # space is required here
 +INSTALL_X1 =
++INSTALL_A0 = find # space is required here
++INSTALL_A1 = | cpio -pud
 +INSTALL_L0 = rm -f # space is required here
 +INSTALL_L1 = && ln # space is required here
 +INSTALL_L2 =
 +INSTALL_L3 =
 +
 +REMOVE_D0  = $(RMDIR) # space is required here
 +REMOVE_D1  = || true
-       QUIET_GEN      = $(QUIET)echo '   ' GEN $@ &&
-       QUIET_BUILT_IN = $(QUIET)echo '   ' BUILTIN $@ &&
++REMOVE_F0  = $(RM_RF) # space is required here
 +REMOVE_F1  =
 +CLEAN_DST  = true
 +
 +ifndef V
 +      QUIET          = @
-       REMOVE_F1 = && echo '   ' REMOVE `basename "$$dst"` && $(RM_F) "$$dst"
++      QUIET_GEN      = $(QUIET)echo '   ' GEN '$@' &&
 +      QUIET_INDEX    = $(QUIET)echo '   ' INDEX $(dir $@) &&
++      QUIET_MSGFMT0  = $(QUIET)printf '    MSGFMT %12s ' $@ && v=`
++      QUIET_MSGFMT1  = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages//g'
 +      QUIET_2DEVNULL = 2>/dev/null
 +
 +      INSTALL_D0 = dir=
 +      INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir"
 +      INSTALL_R0 = src=
 +      INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src
 +      INSTALL_X0 = src=
 +      INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src
++      INSTALL_A0 = src=
++      INSTALL_A1 = && echo '   ' INSTALL '   ' `basename "$$src"` && find "$$src" | cpio -pud
 +
 +      INSTALL_L0 = dst=
 +      INSTALL_L1 = && src=
 +      INSTALL_L2 = && dst=
 +      INSTALL_L3 = && echo '   ' 'LINK       ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln "$$src" "$$dst"
 +
 +      CLEAN_DST = echo ' ' UNINSTALL
 +      REMOVE_D0 = dir=
 +      REMOVE_D1 = && echo ' ' REMOVE $$dir && test -d "$$dir" && $(RMDIR) "$$dir" || true
 +      REMOVE_F0 = dst=
- QUIET_BUILT_IN =
++      REMOVE_F1 = && echo '   ' REMOVE `basename "$$dst"` && $(RM_RF) "$$dst"
 +endif
 +
 +TCL_PATH   ?= tclsh
 +TCLTK_PATH ?= wish
++TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
 +
 +ifeq ($(findstring $(MAKEFLAGS),s),s)
 +QUIET_GEN =
- exedir    = $(dir $(gitexecdir))share/git-gui/lib
- exedir_SQ = $(subst ','\'',$(exedir))
 +endif
 +
++-include config.mak
++
 +DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 +gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
 +SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 +TCL_PATH_SQ = $(subst ','\'',$(TCL_PATH))
 +TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
++TCLTK_PATH_SED = $(subst ','\'',$(subst \,\\,$(TCLTK_PATH)))
 +
 +gg_libdir ?= $(sharedir)/git-gui/lib
 +libdir_SQ  = $(subst ','\'',$(gg_libdir))
++libdir_SED = $(subst ','\'',$(subst \,\\,$(gg_libdir)))
++exedir     = $(dir $(gitexecdir))share/git-gui/lib
++
++GITGUI_SCRIPT   := $$0
++GITGUI_RELATIVE :=
++GITGUI_MACOSXAPP :=
++
++ifeq ($(exedir),$(gg_libdir))
++      GITGUI_RELATIVE := 1
++endif
++
++ifeq ($(uname_O),Cygwin)
++      GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"`
++      ifeq ($(GITGUI_RELATIVE),)
++              gg_libdir := $(shell cygpath --windows --absolute "$(gg_libdir)")
++      endif
++endif
++ifeq ($(uname_S),Darwin)
++      ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)
++              GITGUI_MACOSXAPP := YesPlease
++      endif
++endif
++ifneq (,$(findstring MINGW,$(uname_S)))
++      NO_MSGFMT=1
++      GITGUI_WINDOWS_WRAPPER := YesPlease
++endif
++
++ifdef GITGUI_MACOSXAPP
++GITGUI_MAIN := git-gui.tcl
++
++git-gui: GIT-VERSION-FILE GIT-GUI-VARS
++      $(QUIET_GEN)rm -f $@ $@+ && \
++      echo '#!$(SHELL_PATH_SQ)' >$@+ && \
++      echo 'if test "z$$*" = zversion ||' >>$@+ && \
++      echo '   test "z$$*" = z--version' >>$@+ && \
++      echo then >>$@+ && \
++      echo '  'echo \'git-gui version '$(GITGUI_VERSION)'\' >>$@+ && \
++      echo else >>$@+ && \
++      echo '  'exec \''$(libdir_SQ)/Git Gui.app/Contents/MacOS/Wish'\' \
++              '"$$0" "$$@"' >>$@+ && \
++      echo fi >>$@+ && \
++      chmod +x $@+ && \
++      mv $@+ $@
++
++Git\ Gui.app: GIT-VERSION-FILE GIT-GUI-VARS \
++              macosx/Info.plist \
++              macosx/git-gui.icns \
++              macosx/AppMain.tcl \
++              $(TKFRAMEWORK)/Contents/MacOS/Wish
++      $(QUIET_GEN)rm -rf '$@' '$@'+ && \
++      mkdir -p '$@'+/Contents/MacOS && \
++      mkdir -p '$@'+/Contents/Resources/Scripts && \
++      cp '$(subst ','\'',$(TKFRAMEWORK))/Contents/MacOS/Wish' \
++              '$@'+/Contents/MacOS && \
++      cp macosx/git-gui.icns '$@'+/Contents/Resources && \
++      sed -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
++              macosx/Info.plist \
++              >'$@'+/Contents/Info.plist && \
++      sed -e 's|@@gitexecdir@@|$(gitexecdir_SQ)|' \
++              -e 's|@@GITGUI_LIBDIR@@|$(libdir_SED)|' \
++              macosx/AppMain.tcl \
++              >'$@'+/Contents/Resources/Scripts/AppMain.tcl && \
++      mv '$@'+ '$@'
++endif
++
++ifdef GITGUI_WINDOWS_WRAPPER
++GITGUI_MAIN := git-gui.tcl
 +
- $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
++git-gui: windows/git-gui.sh
++      cp $< $@
++endif
 +
-       GITGUI_RELATIVE= && \
-       if test '$(exedir_SQ)' = '$(libdir_SQ)'; then \
-               if test "$(uname_O)" = Cygwin; \
-               then GITGUI_RELATIVE= ; \
-               else GITGUI_RELATIVE=1; \
-               fi; \
-       fi && \
++$(GITGUI_MAIN): git-gui.sh GIT-VERSION-FILE GIT-GUI-VARS
 +      $(QUIET_GEN)rm -f $@ $@+ && \
-               -e 's|^ exec wish "$$0"| exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' \
 +      sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-               -e 's|@@GITGUI_RELATIVE@@|'$$GITGUI_RELATIVE'|' \
-               -e $$GITGUI_RELATIVE's|@@GITGUI_LIBDIR@@|$(libdir_SQ)|' \
-               $@.sh >$@+ && \
++              -e '1,30s|^ argv0=$$0| argv0=$(GITGUI_SCRIPT)|' \
++              -e '1,30s|^ exec wish | exec '\''$(TCLTK_PATH_SED)'\'' |' \
 +              -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
- $(GITGUI_BUILT_INS): git-gui
-       $(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@
++              -e 's|@@GITGUI_RELATIVE@@|$(GITGUI_RELATIVE)|' \
++              -e '$(GITGUI_RELATIVE)s|@@GITGUI_LIBDIR@@|$(libdir_SED)|' \
++              git-gui.sh >$@+ && \
 +      chmod +x $@+ && \
 +      mv $@+ $@
 +
- lib/tclIndex: $(ALL_LIBFILES)
++XGETTEXT   ?= xgettext
++ifdef NO_MSGFMT
++      MSGFMT ?= $(TCL_PATH) po/po2msg.sh
++else
++      MSGFMT ?= msgfmt
++endif
++
++msgsdir     = $(gg_libdir)/msgs
++msgsdir_SQ  = $(subst ','\'',$(msgsdir))
++PO_TEMPLATE = po/git-gui.pot
++ALL_POFILES = $(wildcard po/*.po)
++ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))
++
++$(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES)
++      $(XGETTEXT) -kmc -LTcl -o $@ $(SCRIPT_SH) $(ALL_LIBFILES)
++update-po:: $(PO_TEMPLATE)
++      $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
++$(ALL_MSGFILES): %.msg : %.po
++      $(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@) $(QUIET_MSGFMT1)
 +
- # These can record GITGUI_VERSION
- $(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE GIT-GUI-VARS
- lib/tclIndex: GIT-GUI-VARS
- 
++lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
 +      $(QUIET_INDEX)if echo \
 +        $(foreach p,$(PRELOAD_FILES),source $p\;) \
 +        auto_mkindex lib '*.tcl' \
 +      | $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \
 +      else \
 +       echo 1>&2 "    * $(TCL_PATH) failed; using unoptimized loading"; \
 +       rm -f $@ ; \
 +       echo '# Autogenerated by git-gui Makefile' >$@ && \
 +       echo >>$@ && \
 +       $(foreach p,$(PRELOAD_FILES) $(ALL_LIBFILES),echo '$(subst lib/,,$p)' >>$@ &&) \
 +       echo >>$@ ; \
 +      fi
 +
- all:: $(ALL_PROGRAMS) lib/tclIndex
 +TRACK_VARS = \
 +      $(subst ','\'',SHELL_PATH='$(SHELL_PATH_SQ)') \
 +      $(subst ','\'',TCL_PATH='$(TCL_PATH_SQ)') \
 +      $(subst ','\'',TCLTK_PATH='$(TCLTK_PATH_SQ)') \
 +      $(subst ','\'',gitexecdir='$(gitexecdir_SQ)') \
 +      $(subst ','\'',gg_libdir='$(libdir_SQ)') \
++      GITGUI_MACOSXAPP=$(GITGUI_MACOSXAPP) \
 +#end TRACK_VARS
 +
 +GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
 +      @VARS='$(TRACK_VARS)'; \
 +      if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
 +              echo 1>&2 "    * new locations or Tcl/Tk interpreter"; \
 +              echo 1>$@ "$$VARS"; \
 +      fi
 +
-       $(QUIET)$(foreach p,$(ALL_LIBFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)' &&) true
++ifdef GITGUI_MACOSXAPP
++all:: git-gui Git\ Gui.app
++endif
++ifdef GITGUI_WINDOWS_WRAPPER
++all:: git-gui
++endif
++all:: $(GITGUI_MAIN) lib/tclIndex $(ALL_MSGFILES)
 +
 +install: all
 +      $(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1)
 +      $(QUIET)$(INSTALL_X0)git-gui $(INSTALL_X1) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +      $(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(INSTALL_L0)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L1)'$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' $(INSTALL_L2)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L3) &&) true
++ifdef GITGUI_WINDOWS_WRAPPER
++      $(QUIET)$(INSTALL_R0)git-gui.tcl $(INSTALL_R1) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
++endif
 +      $(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(INSTALL_D1)
 +      $(QUIET)$(INSTALL_R0)lib/tclIndex $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
-       $(QUIET)$(foreach p,$(ALL_LIBFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
++ifdef GITGUI_MACOSXAPP
++      $(QUIET)$(INSTALL_A0)'Git Gui.app' $(INSTALL_A1) '$(DESTDIR_SQ)$(libdir_SQ)'
++      $(QUIET)$(INSTALL_X0)git-gui.tcl $(INSTALL_X1) '$(DESTDIR_SQ)$(libdir_SQ)'
++endif
++      $(QUIET)$(foreach p,$(ALL_LIBFILES) $(NONTCL_LIBFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)' &&) true
++      $(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(INSTALL_D1)
++      $(QUIET)$(foreach p,$(ALL_MSGFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
 +
 +uninstall:
 +      $(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +      $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui $(REMOVE_F1)
 +      $(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/$p $(REMOVE_F1) &&) true
++ifdef GITGUI_WINDOWS_WRAPPER
++      $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui.tcl $(REMOVE_F1)
++endif
 +      $(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(libdir_SQ)'
 +      $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/tclIndex $(REMOVE_F1)
-       rm -f $(ALL_PROGRAMS) lib/tclIndex
-       rm -f GIT-VERSION-FILE GIT-GUI-VARS
++ifdef GITGUI_MACOSXAPP
++      $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)/Git Gui.app' $(REMOVE_F1)
++      $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/git-gui.tcl $(REMOVE_F1)
++endif
++      $(QUIET)$(foreach p,$(ALL_LIBFILES) $(NONTCL_LIBFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
++      $(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(msgsdir_SQ)'
++      $(QUIET)$(foreach p,$(ALL_MSGFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
 +      $(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(REMOVE_D1)
++      $(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(REMOVE_D1)
 +      $(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(REMOVE_D1)
 +      $(QUIET)$(REMOVE_D0)`dirname '$(DESTDIR_SQ)$(libdir_SQ)'` $(REMOVE_D1)
 +
 +dist-version:
 +      @mkdir -p $(TARDIR)
 +      @echo $(GITGUI_VERSION) > $(TARDIR)/version
 +
 +clean::
++      $(RM_RF) $(GITGUI_MAIN) lib/tclIndex po/*.msg
++      $(RM_RF) GIT-VERSION-FILE GIT-GUI-VARS
++ifdef GITGUI_MACOSXAPP
++      $(RM_RF) 'Git Gui.app'* git-gui
++endif
++ifdef GITGUI_WINDOWS_WRAPPER
++      $(RM_RF) git-gui
++endif
 +
 +.PHONY: all install uninstall dist-version clean
 +.PHONY: .FORCE-GIT-VERSION-FILE
 +.PHONY: .FORCE-GIT-GUI-VARS

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

diff --cc git-gui/lib/about.tcl
index 0000000,719fc54..719fc54
mode 000000,100644..100644
--- /dev/null
--- 2/lib/about.tcl
+++ b/git-gui/lib/about.tcl

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

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

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

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

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

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

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

diff --cc git-gui/lib/choose_repository.tcl
index 0000000,2bac50e..2bac50e
mode 000000,100644..100644
--- /dev/null
--- 2/lib/choose_repository.tcl
+++ b/git-gui/lib/choose_repository.tcl

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

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

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

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

diff --cc git-gui/lib/date.tcl
index 0000000,abe8299..abe8299
mode 000000,100644..100644
--- /dev/null
--- 2/lib/date.tcl
+++ b/git-gui/lib/date.tcl

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

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

diff --cc git-gui/lib/git-gui.ico
index 0000000,563dd66..563dd66
mode 000000,100644..100644
Binary files differ

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

diff --cc git-gui/lib/logo.tcl
index 0000000,5ff7669..5ff7669
mode 000000,100644..100644
--- /dev/null
--- 2/lib/logo.tcl
+++ b/git-gui/lib/logo.tcl

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

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

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

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

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

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

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

diff --cc git-gui/lib/win32.tcl
index 0000000,d7f93d0..d7f93d0
mode 000000,100644..100644
--- /dev/null
--- 2/lib/win32.tcl
+++ b/git-gui/lib/win32.tcl

diff --cc git-gui/lib/win32_shortcut.js
index 0000000,117923f..117923f
mode 000000,100644..100644
--- /dev/null
--- 2/lib/win32_shortcut.js
+++ b/git-gui/lib/win32_shortcut.js

diff --cc git-gui/macosx/AppMain.tcl
index 0000000,41ca08e..41ca08e
mode 000000,100644..100644
--- /dev/null
--- 2/macosx/AppMain.tcl
+++ b/git-gui/macosx/AppMain.tcl

diff --cc git-gui/macosx/Info.plist
index 0000000,99913ec..99913ec
mode 000000,100644..100644
--- /dev/null
--- 2/macosx/Info.plist
+++ b/git-gui/macosx/Info.plist

diff --cc git-gui/macosx/git-gui.icns
index 0000000,77d88a7..77d88a7
mode 000000,100644..100644
Binary files differ

diff --cc git-gui/po/.gitignore
index 0000000,a89cf44..a89cf44
mode 000000,100644..100644
--- /dev/null
--- 2/po/.gitignore
+++ b/git-gui/po/.gitignore

diff --cc git-gui/po/README
index 0000000,9d8b736..9d8b736
mode 000000,100644..100644
--- /dev/null
--- 2/po/README
+++ b/git-gui/po/README

diff --cc git-gui/po/de.po
index 0000000,3df30ed..3df30ed
mode 000000,100644..100644
--- /dev/null
--- 2/po/de.po
+++ b/git-gui/po/de.po

diff --cc git-gui/po/git-gui.pot
index 0000000,00f0f59..00f0f59
mode 000000,100644..100644
--- /dev/null
--- 2/po/git-gui.pot
+++ b/git-gui/po/git-gui.pot

diff --cc git-gui/po/glossary/Makefile
index 0000000,749aa2e..749aa2e
mode 000000,100644..100644
--- /dev/null
--- 2/po/glossary/Makefile
+++ b/git-gui/po/glossary/Makefile

diff --cc git-gui/po/glossary/de.po
index 0000000,c94786c..c94786c
mode 000000,100644..100644
--- /dev/null
--- 2/po/glossary/de.po
+++ b/git-gui/po/glossary/de.po

diff --cc git-gui/po/glossary/git-gui-glossary.pot
index 0000000,48af803..48af803
mode 000000,100644..100644
--- /dev/null
--- 2/po/glossary/git-gui-glossary.pot
+++ b/git-gui/po/glossary/git-gui-glossary.pot

diff --cc git-gui/po/glossary/git-gui-glossary.txt
index 0000000,500d0a0..500d0a0
mode 000000,100644..100644
--- /dev/null
--- 2/po/glossary/git-gui-glossary.txt
+++ b/git-gui/po/glossary/git-gui-glossary.txt

diff --cc git-gui/po/glossary/it.po
index 0000000,8e3d9a2..8e3d9a2
mode 000000,100644..100644
--- /dev/null
--- 2/po/glossary/it.po
+++ b/git-gui/po/glossary/it.po

diff --cc git-gui/po/glossary/txt-to-pot.sh
index 0000000,49bf7c5..49bf7c5
mode 000000,100755..100755
--- /dev/null
--- 2/po/glossary/txt-to-pot.sh
+++ b/git-gui/po/glossary/txt-to-pot.sh

diff --cc git-gui/po/glossary/zh_cn.po
index 0000000,158835b..158835b
mode 000000,100644..100644
--- /dev/null
--- 2/po/glossary/zh_cn.po
+++ b/git-gui/po/glossary/zh_cn.po

diff --cc git-gui/po/hu.po
index 0000000,e8c04f7..e8c04f7
mode 000000,100644..100644
--- /dev/null
--- 2/po/hu.po
+++ b/git-gui/po/hu.po

diff --cc git-gui/po/it.po
index 0000000,7668414..7668414
mode 000000,100644..100644
--- /dev/null
--- 2/po/it.po
+++ b/git-gui/po/it.po

diff --cc git-gui/po/ja.po
index 0000000,f3a547b..f3a547b
mode 000000,100644..100644
--- /dev/null
--- 2/po/ja.po
+++ b/git-gui/po/ja.po

diff --cc git-gui/po/po2msg.sh
index 0000000,c63248e..c63248e
mode 000000,100644..100644
--- /dev/null
--- 2/po/po2msg.sh
+++ b/git-gui/po/po2msg.sh

diff --cc git-gui/po/ru.po
index 0000000,6727a83..6727a83
mode 000000,100644..100644
--- /dev/null
--- 2/po/ru.po
+++ b/git-gui/po/ru.po

diff --cc git-gui/po/zh_cn.po
index 0000000,621c947..621c947
mode 000000,100644..100644
--- /dev/null
--- 2/po/zh_cn.po
+++ b/git-gui/po/zh_cn.po

diff --cc git-gui/windows/git-gui.sh
index 0000000,98f32c0..98f32c0
mode 000000,100644..100644
--- /dev/null
--- 2/windows/git-gui.sh
+++ b/git-gui/windows/git-gui.sh