From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Jun 2012 21:42:38 +0000 (-0700)
Subject: Merge branch 'vr/help-per-platform'
X-Git-Tag: v1.7.12-rc0~95
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a88d7aaee8f8b80fdd2b70d38beb534b5102ee7c;p=git.git

Merge branch 'vr/help-per-platform'

We used to always default to "man" format even on platforms where
"man" viewer is not widely available.

* vr/help-per-platform:
  help: use HTML as the default help format on Windows
---

a88d7aaee8f8b80fdd2b70d38beb534b5102ee7c
diff --cc Makefile
index 62de0b42b,e09ab97a3..f62ca2aeb
--- a/Makefile
+++ b/Makefile
@@@ -297,8 -297,9 +297,12 @@@ all:
  # fast unaligned word loads.  Does NOT work on big-endian systems!
  # Enabled by default on x86_64.
  #
 +# Define GIT_USER_AGENT if you want to change how git identifies itself during
 +# network interactions.  The default is "git/$(GIT_VERSION)".
++#
+ # Define DEFAULT_HELP_FORMAT to "man", "info" or "html"
+ # (defaults to "man") if you want to have a different default when
+ # "git help" is called without a parameter specifying the format.
  
  GIT-VERSION-FILE: FORCE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -1921,11 -1920,10 +1926,15 @@@ SHELL_PATH_CQ_SQ = $(subst ','\'',$(SHE
  BASIC_CFLAGS += -DSHELL_PATH='$(SHELL_PATH_CQ_SQ)'
  endif
  
 +GIT_USER_AGENT_SQ = $(subst ','\'',$(GIT_USER_AGENT))
 +GIT_USER_AGENT_CQ = "$(subst ",\",$(subst \,\\,$(GIT_USER_AGENT)))"
 +GIT_USER_AGENT_CQ_SQ = $(subst ','\'',$(GIT_USER_AGENT_CQ))
 +BASIC_CFLAGS += -DGIT_USER_AGENT='$(GIT_USER_AGENT_CQ_SQ)'
 +
+ ifdef DEFAULT_HELP_FORMAT
+ BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
+ endif
+ 
  ALL_CFLAGS += $(BASIC_CFLAGS)
  ALL_LDFLAGS += $(BASIC_LDFLAGS)