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

* 'maint' of git://repo.or.cz/git-gui:
  git-gui: Allow 'git gui version' outside of a repository
  git-gui: Revert "git-gui: Display all authors of git-gui."
  git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
  git-gui: Allow committing empty merges

diff --cc git-gui/.gitignore
index 805ca2e1c7875fcc9c588dbee5041929c0e451d3,0000000000000000000000000000000000000000..c714d382e87b5c18609f5934890c8b135a720262
mode 100644,000000..100644
--- 1/git-gui/.gitignore
--- /dev/null
+++ b/git-gui/.gitignore
@@@ -1,4 -1,0 +1,3 @@@
- CREDITS-FILE
 +GIT-VERSION-FILE
 +git-citool
 +git-gui

diff --cc git-gui/Makefile
index e486e8f9843ed48f06e667cfa5659e51e5a0e4d1,0000000000000000000000000000000000000000..d74fca287437d39eb193aed356e9a68f89480fd1
mode 100644,000000..100644
--- 1/git-gui/Makefile
--- /dev/null
+++ b/git-gui/Makefile
@@@ -1,69 -1,0 +1,64 @@@
- ALL_PROGRAMS = git-gui $(GITGUI_BUILT_INS)
 +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
 +
++SCRIPT_SH = git-gui.sh
 +GITGUI_BUILT_INS = git-citool
- git-gui: git-gui.sh GIT-VERSION-FILE CREDITS-FILE
++ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH))
 +
 +ifndef SHELL_PATH
 +      SHELL_PATH = /bin/sh
 +endif
 +
 +ifndef gitexecdir
 +      gitexecdir := $(shell git --exec-path)
 +endif
 +
 +ifndef INSTALL
 +      INSTALL = install
 +endif
 +
 +ifndef V
 +      QUIET_GEN      = @echo '   ' GEN $@;
 +      QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
 +endif
 +
 +DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 +gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
 +SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 +
-       sed -n \
-               -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
++$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
 +      $(QUIET_GEN)rm -f $@ $@+ && \
-               -e '1,/^set gitgui_credits /p' \
++      sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 +              -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
-       cat CREDITS-FILE >>$@+ && \
-       sed -e '1,/^set gitgui_credits /d' $@.sh >>$@+ && \
 +              $@.sh >$@+ && \
- CREDITS-FILE: CREDITS-GEN .FORCE-CREDITS-FILE
-       $(QUIET_GEN)$(SHELL_PATH) ./CREDITS-GEN
- 
 +      chmod +x $@+ && \
 +      mv $@+ $@
 +
- dist-version: CREDITS-FILE
 +$(GITGUI_BUILT_INS): git-gui
 +      $(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@
 +
++# These can record GITGUI_VERSION
++$(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE
++
 +all:: $(ALL_PROGRAMS)
 +
 +install: all
 +      $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +      $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +      $(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
 +
-       @cat CREDITS-FILE > $(TARDIR)/credits
++dist-version:
 +      @mkdir -p $(TARDIR)
 +      @echo $(GITGUI_VERSION) > $(TARDIR)/version
-       rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE CREDITS-FILE
 +
 +clean::
- .PHONY: .FORCE-CREDITS-FILE
++      rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE
 +
 +.PHONY: all install dist-version clean
 +.PHONY: .FORCE-GIT-VERSION-FILE

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