author | Junio C Hamano <gitster@pobox.com> | |
Wed, 9 Nov 2011 00:38:14 +0000 (16:38 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 9 Nov 2011 00:38:14 +0000 (16:38 -0800) |
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 | 2 | |||
---|---|---|---|---|
Documentation/Makefile | patch | | diff1 | | diff2 | | blob | history |
Documentation/diff-options.txt | patch | | diff1 | | diff2 | | blob | history |
diff --combined Documentation/Makefile
index 551325604e84713c87e2e95105861626e09fbef5,5a340fd492b41f183978ee273f64b01aedebddd4..304b31edee2e5c4e998c48cc571c66e8264cc581
+++ b/Documentation/Makefile
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
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
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 08b581f040859d39aeaad8294bc7a3e7760ab0b9,66624a17698ac91cfcd6d45d1af6024c4bf066d9..9f7cba2be6a97cb85072d22b3317d37d1afe80bf
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
--quiet::
Disable all output of the program. Implies `--exit-code`.
+ endif::git-log[]
endif::git-format-patch[]
--ext-diff::