From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Nov 2011 00:38:14 +0000 (-0800)
Subject: Sync with 1.7.7.3
X-Git-Tag: v1.7.8-rc2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/14ba45a2e68c296cb2b5bc5e77fdaa0846fb77de?hp=-c

Sync with 1.7.7.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

14ba45a2e68c296cb2b5bc5e77fdaa0846fb77de
diff --combined Documentation/Makefile
index 551325604e,5a340fd492..304b31edee
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -1,9 -1,9 +1,9 @@@
  MAN1_TXT= \
  	$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
  		$(wildcard git-*.txt)) \
 -	gitk.txt git.txt
 +	gitk.txt gitweb.txt git.txt
  MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt \
 -	gitrepository-layout.txt
 +	gitrepository-layout.txt gitweb.conf.txt
  MAN7_TXT=gitcli.txt gittutorial.txt gittutorial-2.txt \
  	gitcvs-migration.txt gitcore-tutorial.txt gitglossary.txt \
  	gitdiffcore.txt gitnamespaces.txt gitrevisions.txt gitworkflows.txt
@@@ -46,8 -46,8 +46,8 @@@ MANPAGE_XSL = manpage-normal.xs
  XMLTO_EXTRA =
  INSTALL?=install
  RM ?= rm -f
- DOC_REF = origin/man
- HTML_REF = origin/html
+ MAN_REPO = ../../git-manpages
+ HTML_REPO = ../../git-htmldocs
  
  infodir?=$(prefix)/share/info
  MAKEINFO=makeinfo
@@@ -327,12 -327,23 +327,23 @@@ $(patsubst %.txt,%.html,$(wildcard howt
  install-webdoc : html
  	'$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST)
  
+ # You must have a clone of git-htmldocs and git-manpages repositories
+ # next to the git repository itself for the following to work.
+ 
  quick-install: quick-install-man
  
- quick-install-man:
- 	'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir)
+ require-manrepo::
+ 	@if test ! -d $(MAN_REPO); \
+ 	then echo "git-manpages repository must exist at $(MAN_REPO)"; exit 1; fi
+ 
+ quick-install-man: require-manrepo
+ 	'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(MAN_REPO) $(DESTDIR)$(mandir)
+ 
+ require-htmlrepo::
+ 	@if test ! -d $(HTML_REPO); \
+ 	then echo "git-htmldocs repository must exist at $(HTML_REPO)"; exit 1; fi
  
- quick-install-html:
- 	'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)
+ quick-install-html: require-htmlrepo
+ 	'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REPO) $(DESTDIR)$(htmldir)
  
  .PHONY: FORCE
diff --combined Documentation/diff-options.txt
index 08b581f040,66624a1769..9f7cba2be6
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -408,11 -408,8 +408,12 @@@ endif::git-format-patch[
  	Show the context between diff hunks, up to the specified number
  	of lines, thereby fusing hunks that are close to each other.
  
 +-W::
 +--function-context::
 +	Show whole surrounding functions of changes.
 +
  ifndef::git-format-patch[]
+ ifndef::git-log[]
  --exit-code::
  	Make the program exit with codes similar to diff(1).
  	That is, it exits with 1 if there were differences and
@@@ -420,6 -417,7 +421,7 @@@
  
  --quiet::
  	Disable all output of the program. Implies `--exit-code`.
+ endif::git-log[]
  endif::git-format-patch[]
  
  --ext-diff::