commit 2ec0cb7959b0bf965d54f95453f5b4b34e8d3100
author Shawn O. Pearce <spearce@spearce.org> Mon Mar 12 13:26:59 2007 -0400
committer Shawn O. Pearce <spearce@spearce.org> Mon Mar 12 13:26:59 2007 -0400
tree 56e3e7313ce204a3cef274c81e8f125f9b03669e
parent 0c3b4aac8ecdd039bac663a7d1b6bd373b7e250d
parent 756d846fea4ac4b3bf0a0aea9fbf721138cf34cc

Merge branch 'maint'

* maint:
  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

Makefile

diff --git a/Makefile b/Makefile
index d74fca2..b82789e 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,11 @@
 	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
 endif
 
+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))