Merge branch 'maint' of git://repo.or.cz/git-gui into maint

* 'maint' of git://repo.or.cz/git-gui:
  git-gui: Disable native platform text selection in "lists"
  git-gui: Paper bag fix "Commit->Revert" format arguments
  git-gui: Provide 'uninstall' Makefile target to undo an installation
  git-gui: Font chooser to handle a large number of font families
  git-gui: Make backporting changes from i18n version easier
  git-gui: Don't delete send on Windows as it doesn't exist
  git-gui: Trim trailing slashes from untracked submodule names
  git-gui: Assume untracked directories are Git submodules
  git-gui: handle "deleted symlink" diff marker
  git-gui: show unstaged symlinks in diff viewer
  git-gui: Avoid use of libdir in Makefile
  git-gui: Disable Tk send in all git-gui sessions
  git-gui: lib/index.tcl: handle files with % in the filename properly
  git-gui: Properly set the state of "Stage/Unstage Hunk" action
  git-gui: Fix detaching current branch during checkout
  git-gui: Correct starting of git-remote to handle -w option

diff --cc git-gui/Makefile
index 1bac6fed46635e2387d16e801294a4750476ddaa,0000000000000000000000000000000000000000..18e67501375c10beebd5ec3a4d73a07aedaca81f
mode 100644,000000..100644
--- 1/git-gui/Makefile
--- /dev/null
+++ b/git-gui/Makefile
@@@ -1,159 -1,0 +1,185 @@@
- libdir   ?= $(sharedir)/git-gui/lib
- libdir_SQ = $(subst ','\'',$(libdir))
 +all::
 +
 +# Define V=1 to have a more verbose compile.
 +#
 +
 +GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 +      @$(SHELL_PATH) ./GIT-VERSION-GEN
 +-include GIT-VERSION-FILE
 +
 +uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
 +
 +SCRIPT_SH = git-gui.sh
 +GITGUI_BUILT_INS = git-citool
 +ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH))
 +ALL_LIBFILES = $(wildcard lib/*.tcl)
 +PRELOAD_FILES = lib/class.tcl
 +
 +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
 +
++RM_F      ?= rm -f
++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_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
++REMOVE_F0  = $(RM_F) # space is required here
++REMOVE_F1  =
++CLEAN_DST  = true
++
 +ifndef V
 +      QUIET          = @
 +      QUIET_GEN      = $(QUIET)echo '   ' GEN $@ &&
 +      QUIET_BUILT_IN = $(QUIET)echo '   ' BUILTIN $@ &&
 +      QUIET_INDEX    = $(QUIET)echo '   ' INDEX $(dir $@) &&
 +      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_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=
++      REMOVE_F1 = && echo '   ' REMOVE `basename "$$dst"` && $(RM_F) "$$dst"
 +endif
 +
 +TCL_PATH   ?= tclsh
 +TCLTK_PATH ?= wish
 +
 +ifeq ($(findstring $(MAKEFLAGS),s),s)
 +QUIET_GEN =
 +QUIET_BUILT_IN =
 +endif
 +
 +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))
 +
-       $(subst ','\'',libdir='$(libdir_SQ)') \
++gg_libdir ?= $(sharedir)/git-gui/lib
++libdir_SQ  = $(subst ','\'',$(gg_libdir))
 +
 +exedir    = $(dir $(gitexecdir))share/git-gui/lib
 +exedir_SQ = $(subst ','\'',$(exedir))
 +
 +$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
 +      $(QUIET_GEN)rm -f $@ $@+ && \
 +      GITGUI_RELATIVE= && \
 +      if test '$(exedir_SQ)' = '$(libdir_SQ)'; then \
 +              if test "$(uname_O)" = Cygwin; \
 +              then GITGUI_RELATIVE= ; \
 +              else GITGUI_RELATIVE=1; \
 +              fi; \
 +      fi && \
 +      sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 +              -e 's|^ exec wish "$$0"| exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' \
 +              -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
 +              -e 's|@@GITGUI_RELATIVE@@|'$$GITGUI_RELATIVE'|' \
 +              -e $$GITGUI_RELATIVE's|@@GITGUI_LIBDIR@@|$(libdir_SQ)|' \
 +              $@.sh >$@+ && \
 +      chmod +x $@+ && \
 +      mv $@+ $@
 +
 +$(GITGUI_BUILT_INS): git-gui
 +      $(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@
 +
 +lib/tclIndex: $(ALL_LIBFILES)
 +      $(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
 +
 +# These can record GITGUI_VERSION
 +$(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE GIT-GUI-VARS
 +lib/tclIndex: GIT-GUI-VARS
 +
 +TRACK_VARS = \
 +      $(subst ','\'',SHELL_PATH='$(SHELL_PATH_SQ)') \
 +      $(subst ','\'',TCL_PATH='$(TCL_PATH_SQ)') \
 +      $(subst ','\'',TCLTK_PATH='$(TCLTK_PATH_SQ)') \
 +      $(subst ','\'',gitexecdir='$(gitexecdir_SQ)') \
- .PHONY: all install dist-version clean
++      $(subst ','\'',gg_libdir='$(libdir_SQ)') \
 +#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
 +
 +all:: $(ALL_PROGRAMS) lib/tclIndex
 +
 +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
 +      $(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), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_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
++      $(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(libdir_SQ)'
++      $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/tclIndex $(REMOVE_F1)
++      $(QUIET)$(foreach p,$(ALL_LIBFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
++      $(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(gitexecdir_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 -f $(ALL_PROGRAMS) lib/tclIndex
 +      rm -f GIT-VERSION-FILE GIT-GUI-VARS
 +
++.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/browser.tcl
Simple merge

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

diff --cc git-gui/lib/choose_font.tcl
index 0000000000000000000000000000000000000000,0c4051b3752b4f88e50e1f4f22189d826234668a..0c4051b3752b4f88e50e1f4f22189d826234668a
mode 000000,100644..100644
--- /dev/null
--- 2/lib/choose_font.tcl
+++ b/git-gui/lib/choose_font.tcl

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

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

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