-include GIT-EXCLUDED-PROGRAMS
MAN1_TXT += $(filter-out \
- $(patsubst %,%.txt,$(EXCLUDED_PROGRAMS)) \
- $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
- $(wildcard git-*.txt))
-MAN1_TXT += git.txt
-MAN1_TXT += gitk.txt
-MAN1_TXT += gitweb.txt
-MAN1_TXT += scalar.txt
+ $(patsubst %,%.adoc,$(EXCLUDED_PROGRAMS)) \
+ $(addsuffix .adoc, $(ARTICLES) $(SP_ARTICLES)), \
+ $(wildcard git-*.adoc))
+MAN1_TXT += git.adoc
+MAN1_TXT += gitk.adoc
+MAN1_TXT += gitweb.adoc
+MAN1_TXT += scalar.adoc
# man5 / man7 guides (note: new guides should also be added to command-list.txt)
-MAN5_TXT += gitattributes.txt
-MAN5_TXT += gitformat-bundle.txt
-MAN5_TXT += gitformat-chunk.txt
-MAN5_TXT += gitformat-commit-graph.txt
-MAN5_TXT += gitformat-index.txt
-MAN5_TXT += gitformat-pack.txt
-MAN5_TXT += gitformat-signature.txt
-MAN5_TXT += githooks.txt
-MAN5_TXT += gitignore.txt
-MAN5_TXT += gitmailmap.txt
-MAN5_TXT += gitmodules.txt
-MAN5_TXT += gitprotocol-capabilities.txt
-MAN5_TXT += gitprotocol-common.txt
-MAN5_TXT += gitprotocol-http.txt
-MAN5_TXT += gitprotocol-pack.txt
-MAN5_TXT += gitprotocol-v2.txt
-MAN5_TXT += gitrepository-layout.txt
-MAN5_TXT += gitweb.conf.txt
-
-MAN7_TXT += gitcli.txt
-MAN7_TXT += gitcore-tutorial.txt
-MAN7_TXT += gitcredentials.txt
-MAN7_TXT += gitcvs-migration.txt
-MAN7_TXT += gitdiffcore.txt
-MAN7_TXT += giteveryday.txt
-MAN7_TXT += gitfaq.txt
-MAN7_TXT += gitglossary.txt
-MAN7_TXT += gitpacking.txt
-MAN7_TXT += gitnamespaces.txt
-MAN7_TXT += gitremote-helpers.txt
-MAN7_TXT += gitrevisions.txt
-MAN7_TXT += gitsubmodules.txt
-MAN7_TXT += gittutorial-2.txt
-MAN7_TXT += gittutorial.txt
-MAN7_TXT += gitworkflows.txt
-
-HOWTO_TXT += $(wildcard howto/*.txt)
-
-DOC_DEP_TXT += $(wildcard *.txt)
-DOC_DEP_TXT += $(wildcard config/*.txt)
-DOC_DEP_TXT += $(wildcard includes/*.txt)
+MAN5_TXT += gitattributes.adoc
+MAN5_TXT += gitformat-bundle.adoc
+MAN5_TXT += gitformat-chunk.adoc
+MAN5_TXT += gitformat-commit-graph.adoc
+MAN5_TXT += gitformat-index.adoc
+MAN5_TXT += gitformat-pack.adoc
+MAN5_TXT += gitformat-signature.adoc
+MAN5_TXT += githooks.adoc
+MAN5_TXT += gitignore.adoc
+MAN5_TXT += gitmailmap.adoc
+MAN5_TXT += gitmodules.adoc
+MAN5_TXT += gitprotocol-capabilities.adoc
+MAN5_TXT += gitprotocol-common.adoc
+MAN5_TXT += gitprotocol-http.adoc
+MAN5_TXT += gitprotocol-pack.adoc
+MAN5_TXT += gitprotocol-v2.adoc
+MAN5_TXT += gitrepository-layout.adoc
+MAN5_TXT += gitweb.conf.adoc
+
+MAN7_TXT += gitcli.adoc
+MAN7_TXT += gitcore-tutorial.adoc
+MAN7_TXT += gitcredentials.adoc
+MAN7_TXT += gitcvs-migration.adoc
+MAN7_TXT += gitdiffcore.adoc
+MAN7_TXT += giteveryday.adoc
+MAN7_TXT += gitfaq.adoc
+MAN7_TXT += gitglossary.adoc
+MAN7_TXT += gitpacking.adoc
+MAN7_TXT += gitnamespaces.adoc
+MAN7_TXT += gitremote-helpers.adoc
+MAN7_TXT += gitrevisions.adoc
+MAN7_TXT += gitsubmodules.adoc
+MAN7_TXT += gittutorial-2.adoc
+MAN7_TXT += gittutorial.adoc
+MAN7_TXT += gitworkflows.adoc
+
+HOWTO_TXT += $(wildcard howto/*.adoc)
+
+DOC_DEP_TXT += $(wildcard *.adoc)
+DOC_DEP_TXT += $(wildcard config/*.adoc)
+DOC_DEP_TXT += $(wildcard includes/*.adoc)
ifdef MAN_FILTER
MAN_TXT = $(filter $(MAN_FILTER),$(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT))
MAN_FILTER = $(MAN_TXT)
endif
-MAN_XML = $(patsubst %.txt,%.xml,$(MAN_TXT))
-MAN_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
+MAN_XML = $(patsubst %.adoc,%.xml,$(MAN_TXT))
+MAN_HTML = $(patsubst %.adoc,%.html,$(MAN_TXT))
GIT_MAN_REF = master
OBSOLETE_HTML += everyday.html
SP_ARTICLES += howto/keep-canonical-history-correct
SP_ARTICLES += howto/maintain-git
SP_ARTICLES += howto/coordinate-embargoed-releases
-API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
+API_DOCS = $(patsubst %.adoc,%,$(filter-out technical/api-index-skel.adoc technical/api-index.adoc, $(wildcard technical/api-*.adoc)))
SP_ARTICLES += $(API_DOCS)
TECH_DOCS += DecisionMaking
HTML_FILTER ?= $(ARTICLES_HTML) $(OBSOLETE_HTML)
DOC_HTML = $(MAN_HTML) $(filter $(HTML_FILTER),$(ARTICLES_HTML) $(OBSOLETE_HTML))
-DOC_MAN1 = $(patsubst %.txt,%.1,$(filter $(MAN_FILTER),$(MAN1_TXT)))
-DOC_MAN5 = $(patsubst %.txt,%.5,$(filter $(MAN_FILTER),$(MAN5_TXT)))
-DOC_MAN7 = $(patsubst %.txt,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT)))
+DOC_MAN1 = $(patsubst %.adoc,%.1,$(filter $(MAN_FILTER),$(MAN1_TXT)))
+DOC_MAN5 = $(patsubst %.adoc,%.5,$(filter $(MAN_FILTER),$(MAN5_TXT)))
+DOC_MAN7 = $(patsubst %.adoc,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT)))
prefix ?= $(HOME)
bindir ?= $(prefix)/bin
install-html: html
'$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir)
-mergetools_txt = mergetools-diff.txt mergetools-merge.txt
+mergetools_txt = mergetools-diff.adoc mergetools-merge.adoc
#
# Determine "include::" file references in asciidoc files.
-include doc.dep
endif
-cmds_txt = cmds-ancillaryinterrogators.txt \
- cmds-ancillarymanipulators.txt \
- cmds-mainporcelain.txt \
- cmds-plumbinginterrogators.txt \
- cmds-plumbingmanipulators.txt \
- cmds-synchingrepositories.txt \
- cmds-synchelpers.txt \
- cmds-guide.txt \
- cmds-developerinterfaces.txt \
- cmds-userinterfaces.txt \
- cmds-purehelpers.txt \
- cmds-foreignscminterface.txt
+cmds_txt = cmds-ancillaryinterrogators.adoc \
+ cmds-ancillarymanipulators.adoc \
+ cmds-mainporcelain.adoc \
+ cmds-plumbinginterrogators.adoc \
+ cmds-plumbingmanipulators.adoc \
+ cmds-synchingrepositories.adoc \
+ cmds-synchelpers.adoc \
+ cmds-guide.adoc \
+ cmds-developerinterfaces.adoc \
+ cmds-userinterfaces.adoc \
+ cmds-purehelpers.adoc \
+ cmds-foreignscminterface.adoc
$(cmds_txt): cmd-list.made
$(QUIET_GEN)$(PERL_PATH) ./cmd-list.perl .. . $(cmds_txt) && \
date >$@
-mergetools-%.txt: generate-mergetool-list.sh ../git-mergetool--lib.sh $(wildcard ../mergetools/*)
-mergetools-diff.txt:
+mergetools-%.adoc: generate-mergetool-list.sh ../git-mergetool--lib.sh $(wildcard ../mergetools/*)
+mergetools-diff.adoc:
$(QUIET_GEN)$(SHELL_PATH) ./generate-mergetool-list.sh .. diff $@
-mergetools-merge.txt:
+mergetools-merge.adoc:
$(QUIET_GEN)$(SHELL_PATH) ./generate-mergetool-list.sh .. merge $@
TRACK_ASCIIDOCFLAGS = $(subst ','\'',$(ASCIIDOC_COMMON):$(ASCIIDOC_HTML):$(ASCIIDOC_DOCBOOK))
$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7
$(RM) *.texi *.texi+ *.texi++ git.info gitman.info
$(RM) *.pdf
- $(RM) howto-index.txt howto/*.html doc.dep
- $(RM) technical/*.html technical/api-index.txt
- $(RM) SubmittingPatches.txt
+ $(RM) howto-index.adoc howto/*.html doc.dep
+ $(RM) technical/*.html technical/api-index.adoc
+ $(RM) SubmittingPatches.adoc
$(RM) $(cmds_txt) $(mergetools_txt) *.made
$(RM) GIT-ASCIIDOCFLAGS
$(RM) asciidoc.conf asciidoctor-extensions.rb
docinfo.html: docinfo-html.in
$(QUIET_GEN)$(RM) $@ && cat $< >$@
-$(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)
+$(MAN_HTML): %.html : %.adoc $(ASCIIDOC_DEPS)
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@ $<
-$(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS)
+$(OBSOLETE_HTML): %.html : %.adoco $(ASCIIDOC_DEPS)
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $<
manpage-prereqs := $(wildcard manpage*.xsl)
%.7 : %.xml $(manpage-prereqs)
$(manpage-cmd)
-%.xml : %.txt $(ASCIIDOC_DEPS)
+%.xml : %.adoc $(ASCIIDOC_DEPS)
$(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $<
-user-manual.xml: user-manual.txt $(ASCIIDOC_DEPS)
+user-manual.xml: user-manual.adoc $(ASCIIDOC_DEPS)
$(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@ $<
-technical/api-index.txt: technical/api-index-skel.txt \
- technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
- $(QUIET_GEN)'$(SHELL_PATH_SQ)' technical/api-index.sh ./technical ./technical/api-index.txt
+technical/api-index.adoc: technical/api-index-skel.adoc \
+ technical/api-index.sh $(patsubst %,%.adoc,$(API_DOCS))
+ $(QUIET_GEN)'$(SHELL_PATH_SQ)' technical/api-index.sh ./technical ./technical/api-index.adoc
technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
-$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt \
+$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.adoc \
$(ASCIIDOC_DEPS)
- $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt
+ $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.adoc
-SubmittingPatches.txt: SubmittingPatches
+SubmittingPatches.adoc: SubmittingPatches
$(QUIET_GEN) cp $< $@
XSLT = docbook.xsl
gitman.info: gitman.texi
$(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $<
-$(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml
+$(patsubst %.adoc,%.texi,$(MAN_TXT)): %.texi : %.xml
$(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@
-howto-index.txt: howto/howto-index.sh $(HOWTO_TXT)
+howto-index.adoc: howto/howto-index.sh $(HOWTO_TXT)
$(QUIET_GEN)'$(SHELL_PATH_SQ)' ./howto/howto-index.sh $(sort $(HOWTO_TXT)) >$@
-$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt $(ASCIIDOC_DEPS)
- $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt
+$(patsubst %,%.html,$(ARTICLES)) : %.html : %.adoc $(ASCIIDOC_DEPS)
+ $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.adoc
WEBDOC_DEST = /pub/software/scm/git/docs
howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
-$(patsubst %.txt,%.html,$(HOWTO_TXT)): %.html : %.txt $(ASCIIDOC_DEPS)
+$(patsubst %.adoc,%.html,$(HOWTO_TXT)): %.html : %.adoc $(ASCIIDOC_DEPS)
$(QUIET_ASCIIDOC) \
sed -e '1,/^$$/d' $< | \
$(TXT_TO_HTML) - >$@
@for i in $(MAN1_TXT); do echo $$i; done
## Lint: gitlink
-LINT_DOCS_GITLINK = $(patsubst %.txt,.build/lint-docs/gitlink/%.ok,$(HOWTO_TXT) $(DOC_DEP_TXT))
+LINT_DOCS_GITLINK = $(patsubst %.adoc,.build/lint-docs/gitlink/%.ok,$(HOWTO_TXT) $(DOC_DEP_TXT))
$(LINT_DOCS_GITLINK): lint-gitlink.perl
-$(LINT_DOCS_GITLINK): .build/lint-docs/gitlink/%.ok: %.txt
+$(LINT_DOCS_GITLINK): .build/lint-docs/gitlink/%.ok: %.adoc
$(call mkdir_p_parent_template)
$(QUIET_LINT_GITLINK)$(PERL_PATH) lint-gitlink.perl \
$< \
lint-docs-gitlink: $(LINT_DOCS_GITLINK)
## Lint: man-end-blurb
-LINT_DOCS_MAN_END_BLURB = $(patsubst %.txt,.build/lint-docs/man-end-blurb/%.ok,$(MAN_TXT))
+LINT_DOCS_MAN_END_BLURB = $(patsubst %.adoc,.build/lint-docs/man-end-blurb/%.ok,$(MAN_TXT))
$(LINT_DOCS_MAN_END_BLURB): lint-man-end-blurb.perl
-$(LINT_DOCS_MAN_END_BLURB): .build/lint-docs/man-end-blurb/%.ok: %.txt
+$(LINT_DOCS_MAN_END_BLURB): .build/lint-docs/man-end-blurb/%.ok: %.adoc
$(call mkdir_p_parent_template)
$(QUIET_LINT_MANEND)$(PERL_PATH) lint-man-end-blurb.perl $< >$@
.PHONY: lint-docs-man-end-blurb
## Lint: man-section-order
-LINT_DOCS_MAN_SECTION_ORDER = $(patsubst %.txt,.build/lint-docs/man-section-order/%.ok,$(MAN_TXT))
+LINT_DOCS_MAN_SECTION_ORDER = $(patsubst %.adoc,.build/lint-docs/man-section-order/%.ok,$(MAN_TXT))
$(LINT_DOCS_MAN_SECTION_ORDER): lint-man-section-order.perl
-$(LINT_DOCS_MAN_SECTION_ORDER): .build/lint-docs/man-section-order/%.ok: %.txt
+$(LINT_DOCS_MAN_SECTION_ORDER): .build/lint-docs/man-section-order/%.ok: %.adoc
$(call mkdir_p_parent_template)
$(QUIET_LINT_MANSEC)$(PERL_PATH) lint-man-section-order.perl $< >$@
.PHONY: lint-docs-man-section-order
.PHONY: lint-docs-fsck-msgids
LINT_DOCS_FSCK_MSGIDS = .build/lint-docs/fsck-msgids.ok
$(LINT_DOCS_FSCK_MSGIDS): lint-fsck-msgids.perl
-$(LINT_DOCS_FSCK_MSGIDS): ../fsck.h fsck-msgids.txt
+$(LINT_DOCS_FSCK_MSGIDS): ../fsck.h fsck-msgids.adoc
$(call mkdir_p_parent_template)
$(QUIET_GEN)$(PERL_PATH) lint-fsck-msgids.perl \
- ../fsck.h fsck-msgids.txt $@
+ ../fsck.h fsck-msgids.adoc $@
lint-docs-fsck-msgids: $(LINT_DOCS_FSCK_MSGIDS)
@mkdir -p tmp-meson-diff && \
awk "/^manpages = {$$/ {flag=1 ; next } /^}$$/ { flag=0 } flag { gsub(/^ \047/, \"\"); gsub(/\047 : [157],\$$/, \"\"); print }" meson.build | \
grep -v -e '#' -e '^$$' | \
- sort >tmp-meson-diff/meson.txt && \
- ls git*.txt scalar.txt | grep -v -e git-bisect-lk2009.txt -e git-tools.txt >tmp-meson-diff/actual.txt && \
- if ! cmp tmp-meson-diff/meson.txt tmp-meson-diff/actual.txt; then \
+ sort >tmp-meson-diff/meson.adoc && \
+ ls git*.adoc scalar.adoc | grep -v -e git-bisect-lk2009.adoc -e git-tools.adoc >tmp-meson-diff/actual.adoc && \
+ if ! cmp tmp-meson-diff/meson.adoc tmp-meson-diff/actual.adoc; then \
echo "Meson man pages differ from actual man pages:"; \
- diff -u tmp-meson-diff/meson.txt tmp-meson-diff/actual.txt; \
+ diff -u tmp-meson-diff/meson.adoc tmp-meson-diff/actual.adoc; \
exit 1; \
fi
'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans from
'<start>' to end of file. `-L ,<end>` spans from start of file to '<end>'.
+
-include::line-range-format.txt[]
+include::line-range-format.adoc[]
-l::
Show long rev (Default: off).
sub format_one {
my ($source_dir, $out, $nameattr) = @_;
my ($name, $attr) = @$nameattr;
- my ($path) = "$source_dir/Documentation/$name.txt";
+ my ($path) = "$source_dir/Documentation/$name.adoc";
my ($state, $description);
my $mansection;
$state = 0;
- open I, '<', "$path" or die "No such file $path.txt";
+ open I, '<', "$path" or die "No such file $path.adoc";
while (<I>) {
if (/^(?:git|scalar)[a-z0-9-]*\(([0-9])\)$/) {
$mansection = $1;
}
close I;
if (!defined $description) {
- die "No description found in $path.txt";
+ die "No description found in $path.adoc";
}
if (my ($verify_name, $text) = ($description =~ /^($name) - (.*)/)) {
print $out "linkgit:$name\[$mansection\]::\n\t";
close IN;
for my $out (@categories) {
- my ($cat) = $out =~ /^cmds-(.*)\.txt$/;
+ my ($cat) = $out =~ /^cmds-(.*)\.adoc$/;
my ($path) = "$build_dir/$out";
open O, '>', "$path+" or die "Cannot open output file $out+";
for (@{$cmds{$cat}}) {
names do not conflict with those that are used by Git itself and
other popular tools, and describe them in your documentation.
-include::config/add.txt[]
+include::config/add.adoc[]
-include::config/advice.txt[]
+include::config/advice.adoc[]
-include::config/alias.txt[]
+include::config/alias.adoc[]
-include::config/am.txt[]
+include::config/am.adoc[]
-include::config/apply.txt[]
+include::config/apply.adoc[]
-include::config/attr.txt[]
+include::config/attr.adoc[]
-include::config/bitmap-pseudo-merge.txt[]
+include::config/bitmap-pseudo-merge.adoc[]
-include::config/blame.txt[]
+include::config/blame.adoc[]
-include::config/branch.txt[]
+include::config/branch.adoc[]
-include::config/browser.txt[]
+include::config/browser.adoc[]
-include::config/bundle.txt[]
+include::config/bundle.adoc[]
-include::config/checkout.txt[]
+include::config/checkout.adoc[]
-include::config/clean.txt[]
+include::config/clean.adoc[]
-include::config/clone.txt[]
+include::config/clone.adoc[]
-include::config/color.txt[]
+include::config/color.adoc[]
-include::config/column.txt[]
+include::config/column.adoc[]
-include::config/commit.txt[]
+include::config/commit.adoc[]
-include::config/commitgraph.txt[]
+include::config/commitgraph.adoc[]
-include::config/completion.txt[]
+include::config/completion.adoc[]
-include::config/core.txt[]
+include::config/core.adoc[]
-include::config/credential.txt[]
+include::config/credential.adoc[]
-include::config/diff.txt[]
+include::config/diff.adoc[]
-include::config/difftool.txt[]
+include::config/difftool.adoc[]
-include::config/extensions.txt[]
+include::config/extensions.adoc[]
-include::config/fastimport.txt[]
+include::config/fastimport.adoc[]
-include::config/feature.txt[]
+include::config/feature.adoc[]
-include::config/fetch.txt[]
+include::config/fetch.adoc[]
-include::config/filter.txt[]
+include::config/filter.adoc[]
-include::config/format.txt[]
+include::config/format.adoc[]
-include::config/fsck.txt[]
+include::config/fsck.adoc[]
-include::config/fsmonitor--daemon.txt[]
+include::config/fsmonitor--daemon.adoc[]
-include::config/gc.txt[]
+include::config/gc.adoc[]
-include::config/gitcvs.txt[]
+include::config/gitcvs.adoc[]
-include::config/gitweb.txt[]
+include::config/gitweb.adoc[]
-include::config/gpg.txt[]
+include::config/gpg.adoc[]
-include::config/grep.txt[]
+include::config/grep.adoc[]
-include::config/gui.txt[]
+include::config/gui.adoc[]
-include::config/guitool.txt[]
+include::config/guitool.adoc[]
-include::config/help.txt[]
+include::config/help.adoc[]
-include::config/http.txt[]
+include::config/http.adoc[]
-include::config/i18n.txt[]
+include::config/i18n.adoc[]
-include::config/imap.txt[]
+include::config/imap.adoc[]
-include::config/includeif.txt[]
+include::config/includeif.adoc[]
-include::config/index.txt[]
+include::config/index.adoc[]
-include::config/init.txt[]
+include::config/init.adoc[]
-include::config/instaweb.txt[]
+include::config/instaweb.adoc[]
-include::config/interactive.txt[]
+include::config/interactive.adoc[]
-include::config/log.txt[]
+include::config/log.adoc[]
-include::config/lsrefs.txt[]
+include::config/lsrefs.adoc[]
-include::config/mailinfo.txt[]
+include::config/mailinfo.adoc[]
-include::config/mailmap.txt[]
+include::config/mailmap.adoc[]
-include::config/maintenance.txt[]
+include::config/maintenance.adoc[]
-include::config/man.txt[]
+include::config/man.adoc[]
-include::config/merge.txt[]
+include::config/merge.adoc[]
-include::config/mergetool.txt[]
+include::config/mergetool.adoc[]
-include::config/notes.txt[]
+include::config/notes.adoc[]
-include::config/pack.txt[]
+include::config/pack.adoc[]
-include::config/pager.txt[]
+include::config/pager.adoc[]
-include::config/pretty.txt[]
+include::config/pretty.adoc[]
-include::config/promisor.txt[]
+include::config/promisor.adoc[]
-include::config/protocol.txt[]
+include::config/protocol.adoc[]
-include::config/pull.txt[]
+include::config/pull.adoc[]
-include::config/push.txt[]
+include::config/push.adoc[]
-include::config/rebase.txt[]
+include::config/rebase.adoc[]
-include::config/receive.txt[]
+include::config/receive.adoc[]
-include::config/reftable.txt[]
+include::config/reftable.adoc[]
-include::config/remote.txt[]
+include::config/remote.adoc[]
-include::config/remotes.txt[]
+include::config/remotes.adoc[]
-include::config/repack.txt[]
+include::config/repack.adoc[]
-include::config/rerere.txt[]
+include::config/rerere.adoc[]
-include::config/revert.txt[]
+include::config/revert.adoc[]
-include::config/safe.txt[]
+include::config/safe.adoc[]
-include::config/sendemail.txt[]
+include::config/sendemail.adoc[]
-include::config/sequencer.txt[]
+include::config/sequencer.adoc[]
-include::config/showbranch.txt[]
+include::config/showbranch.adoc[]
-include::config/sparse.txt[]
+include::config/sparse.adoc[]
-include::config/splitindex.txt[]
+include::config/splitindex.adoc[]
-include::config/ssh.txt[]
+include::config/ssh.adoc[]
-include::config/stash.txt[]
+include::config/stash.adoc[]
-include::config/status.txt[]
+include::config/status.adoc[]
-include::config/submodule.txt[]
+include::config/submodule.adoc[]
-include::config/tag.txt[]
+include::config/tag.adoc[]
-include::config/tar.txt[]
+include::config/tar.adoc[]
-include::config/trace2.txt[]
+include::config/trace2.adoc[]
-include::config/transfer.txt[]
+include::config/transfer.adoc[]
-include::config/uploadarchive.txt[]
+include::config/uploadarchive.adoc[]
-include::config/uploadpack.txt[]
+include::config/uploadpack.adoc[]
-include::config/url.txt[]
+include::config/url.adoc[]
-include::config/user.txt[]
+include::config/user.adoc[]
-include::config/versionsort.txt[]
+include::config/versionsort.adoc[]
-include::config/web.txt[]
+include::config/web.adoc[]
-include::config/worktree.txt[]
+include::config/worktree.adoc[]
Set this option to `true` to make the diff driver cache the text
conversion outputs. See linkgit:gitattributes[5] for details.
-include::{build_dir}/mergetools-diff.txt[]
+include::{build_dir}/mergetools-diff.adoc[]
`diff.indentHeuristic`::
Set this option to `false` to disable the default heuristics
refStorage::
Specify the ref storage format to use. The acceptable values are:
+
-include::../ref-storage-format.txt[]
+include::../ref-storage-format.adoc[]
+
Note that this setting should only be set by linkgit:git-init[1] or
If true, this is equivalent to the --verify-signatures command
line option. See linkgit:git-merge[1] for details.
-include::fmt-merge-msg.txt[]
+include::fmt-merge-msg.adoc[]
merge.renameLimit::
The number of files to consider in the exhaustive portion of
Any other value is treated as a custom merge tool and requires that a
corresponding mergetool.<guitool>.cmd variable is defined.
-include::{build_dir}/mergetools-merge.txt[]
+include::{build_dir}/mergetools-merge.adoc[]
merge.verbosity::
Controls the amount of output shown by the recursive merge
It may be overridden by the `GIT_TRACE2_EVENT` environment variable.
The following table shows possible values.
+
-include::../trace2-target-values.txt[]
+include::../trace2-target-values.adoc[]
trace2.normalBrief::
Boolean. When true `time`, `filename`, and `line` fields are
all parents.
-include::diff-generate-patch.txt[]
+include::diff-generate-patch.adoc[]
other diff formats
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
:git-add: 1
-include::config/add.txt[]
+include::config/add.adoc[]
SEE ALSO
--------
am.threeWay configuration variable. For more information,
see am.threeWay in linkgit:git-config[1].
-include::rerere-options.txt[]
+include::rerere-options.adoc[]
--ignore-space-change::
--ignore-whitespace::
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/am.txt[]
+include::config/am.adoc[]
SEE ALSO
--------
OPTIONS
-------
-include::blame-options.txt[]
+include::blame-options.adoc[]
SEE ALSO
--------
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/apply.txt[]
+include::config/apply.adoc[]
SUBMODULES
----------
OPTIONS
-------
-include::blame-options.txt[]
+include::blame-options.adoc[]
-c::
Use the same output mode as linkgit:git-annotate[1] (Default: off).
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/blame.txt[]
+include::config/blame.adoc[]
SEE ALSO
--------
`--list` is used or implied. The default is to use a pager.
See linkgit:git-config[1].
-include::includes/cmd-config-section-rest.txt[]
+include::includes/cmd-config-section-rest.adoc[]
-include::config/branch.txt[]
+include::config/branch.adoc[]
EXAMPLES
--------
- `--no-merged` is used to find branches which are candidates for merging
into HEAD, since those branches are not fully contained by HEAD.
-include::ref-reachability-filters.txt[]
+include::ref-reachability-filters.adoc[]
SEE ALSO
--------
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/checkout.txt[]
+include::config/checkout.adoc[]
SEE ALSO
--------
Pass the merge strategy-specific option through to the
merge strategy. See linkgit:git-merge[1] for details.
-include::rerere-options.txt[]
+include::rerere-options.adoc[]
SEQUENCER SUBCOMMANDS
---------------------
-include::sequencer.txt[]
+include::sequencer.adoc[]
EXAMPLES
--------
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/clean.txt[]
+include::config/clean.adoc[]
SEE ALSO
--------
Specify the given ref storage format for the repository. The valid values are:
+
-include::ref-storage-format.txt[]
+include::ref-storage-format.adoc[]
`-j` _<n>_::
`--jobs` _<n>_::
`--shallow-since`, and `--shallow-exclude`.
:git-clone: 1
-include::urls.txt[]
+include::urls.adoc[]
EXAMPLES
--------
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/init.txt[]
+include::config/init.adoc[]
-include::config/clone.txt[]
+include::config/clone.adoc[]
GIT
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/column.txt[]
+include::config/column.adoc[]
GIT
---
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/commitgraph.txt[]
+include::config/commitgraph.adoc[]
FILE FORMAT
entry is not provided via "<" redirection, 'git commit-tree' will just wait
for one to be entered and terminated with ^D.
-include::date-formats.txt[]
+include::date-formats.adoc[]
Discussion
----------
-include::i18n.txt[]
+include::i18n.adoc[]
FILES
-----
message, the commit is aborted. This has no effect when a message
is given by other means, e.g. with the `-m` or `-F` options.
-include::signoff-option.txt[]
+include::signoff-option.adoc[]
--trailer <token>[(=|:)<value>]::
Specify a (<token>, <value>) pair that should be applied as a
the other options are provided for more complex use cases.
:git-commit: 1
-include::date-formats.txt[]
+include::date-formats.adoc[]
DISCUSSION
----------
For example, linkgit:git-format-patch[1] turns a commit into email, and it uses
the title on the Subject line and the rest of the commit in the body.
-include::i18n.txt[]
+include::i18n.adoc[]
ENVIRONMENT AND CONFIGURATION VARIABLES
---------------------------------------
`VISUAL` environment variable, or the `EDITOR` environment variable (in that
order). See linkgit:git-var[1] for details.
-include::includes/cmd-config-section-rest.txt[]
+include::includes/cmd-config-section-rest.adoc[]
-include::config/commit.txt[]
+include::config/commit.adoc[]
HOOKS
-----
http.sslverify false
------------
-include::config.txt[]
+include::config.adoc[]
BUGS
----
OPTIONS
-------
-include::diff-options.txt[]
+include::diff-options.adoc[]
-1 --base::
-2 --ours::
Remain silent even for nonexistent files
-include::diff-format.txt[]
+include::diff-format.adoc[]
GIT
---
OPTIONS
-------
-include::diff-options.txt[]
+include::diff-options.adoc[]
<tree-ish>::
The id of a tree object to diff against.
'git diff-index' say that all non-checked-out files are up
to date.
-include::diff-format.txt[]
+include::diff-format.adoc[]
OPERATING MODES
---------------
OPTIONS
-------
-include::diff-options.txt[]
+include::diff-options.adoc[]
<tree-ish>::
The id of a tree object.
This flag causes 'git diff-tree --stdin' to also show
the commit message before the differences.
-include::pretty-options.txt[]
+include::pretty-options.adoc[]
--no-commit-id::
'git diff-tree' outputs a line with the commit ID when
if the diff itself is empty.
-include::pretty-formats.txt[]
+include::pretty-formats.adoc[]
-include::diff-format.txt[]
+include::diff-format.adoc[]
GIT
---
OPTIONS
-------
:git-diff: 1
-include::diff-options.txt[]
+include::diff-options.adoc[]
`-1`::
`--base`::
names and get diff for all files under them).
-include::diff-format.txt[]
+include::diff-format.adoc[]
EXAMPLES
--------
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
:git-diff: 1
-include::config/diff.txt[]
+include::config/diff.adoc[]
SEE ALSO
--------
'git difftool' falls back to 'git mergetool' config variables when the
difftool equivalents have not been defined.
-include::includes/cmd-config-section-rest.txt[]
+include::includes/cmd-config-section-rest.adoc[]
-include::config/difftool.txt[]
+include::config/difftool.adoc[]
SEE ALSO
--------
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/fastimport.txt[]
+include::config/fastimport.adoc[]
SEE ALSO
--------
OPTIONS
-------
-include::fetch-options.txt[]
+include::fetch-options.adoc[]
-include::pull-fetch-param.txt[]
+include::pull-fetch-param.adoc[]
--stdin::
Read refspecs, one per line, from stdin in addition to those provided
as arguments. The "tag <name>" format is not supported.
-include::urls-remotes.txt[]
+include::urls-remotes.adoc[]
CONFIGURED REMOTE-TRACKING BRANCHES[[CRTB]]
objects will eventually be removed by git's built-in housekeeping (see
linkgit:git-gc[1]).
-include::transfer-data-leaks.txt[]
+include::transfer-data-leaks.adoc[]
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/fetch.txt[]
+include::config/fetch.adoc[]
BUGS
----
CONFIGURATION
-------------
-include::config/fmt-merge-msg.txt[]
+include::config/fmt-merge-msg.adoc[]
merge.summary::
Synonym to `merge.log`; this is deprecated and will be removed in
NOTES
-----
-include::ref-reachability-filters.txt[]
+include::ref-reachability-filters.adoc[]
SEE ALSO
--------
OPTIONS
-------
:git-format-patch: 1
-include::diff-options.txt[]
+include::diff-options.adoc[]
-<n>::
Prepare patches from the topmost <n> commits.
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/fsck.txt[]
+include::config/fsck.adoc[]
DISCUSSION
----------
error, other than those that are marked as "(FATAL)", can be tweaked
by setting the corresponding `fsck.<msg-id>` configuration variable.
-include::fsck-msgids.txt[]
+include::fsck-msgids.adoc[]
Environment Variables
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/fsmonitor--daemon.txt[]
+include::config/fsmonitor--daemon.adoc[]
GIT
---
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/gc.txt[]
+include::config/gc.adoc[]
NOTES
-----
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/grep.txt[]
+include::config/grep.adoc[]
GIT
---
To use the tool, `imap.folder` and either `imap.tunnel` or `imap.host` must be set
to appropriate values.
-include::includes/cmd-config-section-rest.txt[]
+include::includes/cmd-config-section-rest.adoc[]
-include::config/imap.txt[]
+include::config/imap.adoc[]
EXAMPLES
--------
+
This option cannot be used with --stdin.
+
-include::object-format-disclaimer.txt[]
+include::object-format-disclaimer.adoc[]
--promisor[=<message>]::
Before committing the pack-index, create a .promisor file for this
Specify the given object _<format>_ (hash algorithm) for the repository. The valid
values are `sha1` and (if enabled) `sha256`. `sha1` is the default.
+
-include::object-format-disclaimer.txt[]
+include::object-format-disclaimer.adoc[]
`--ref-format=<format>`::
Specify the given ref storage _<format>_ for the repository. The valid values are:
+
-include::ref-storage-format.txt[]
+include::ref-storage-format.adoc[]
`--template=<template-directory>`::
Specify the directory from which templates will be used. (See the "TEMPLATE
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
:git-init:
-include::config/init.txt[]
+include::config/init.adoc[]
GIT
---
Shows the commit logs.
:git-log: 1
-include::rev-list-description.txt[]
+include::rev-list-description.adoc[]
The command takes options applicable to the linkgit:git-rev-list[1]
command to control what is shown and how, and options applicable to
Intended to speed up tools that read log messages from `git log`
output by allowing them to allocate space in advance.
-include::line-range-options.txt[]
+include::line-range-options.adoc[]
<revision-range>::
Show only commits in the specified revision range. When no
Paths may need to be prefixed with `--` to separate them from
options or the revision range, when confusion arises.
-include::rev-list-options.txt[]
+include::rev-list-options.adoc[]
-include::pretty-formats.txt[]
+include::pretty-formats.adoc[]
DIFF FORMATTING
---------------
:git-log: 1
:diff-merges-default: `off`
-include::diff-options.txt[]
+include::diff-options.adoc[]
-include::diff-generate-patch.txt[]
+include::diff-generate-patch.adoc[]
EXAMPLES
--------
DISCUSSION
----------
-include::i18n.txt[]
+include::i18n.adoc[]
CONFIGURATION
-------------
Defaults to the value of `i18n.commitEncoding` if set, and UTF-8
otherwise.
-include::includes/cmd-config-section-rest.txt[]
+include::includes/cmd-config-section-rest.adoc[]
-include::config/log.txt[]
+include::config/log.adoc[]
-include::config/notes.txt[]
+include::config/notes.adoc[]
GIT
---
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/mailinfo.txt[]
+include::config/mailinfo.adoc[]
GIT
---
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/maintenance.txt[]
+include::config/maintenance.adoc[]
GIT
-------
:git-merge: 1
-include::merge-options.txt[]
+include::merge-options.adoc[]
-m <msg>::
Set the commit message to be used for the merge commit (in
If `--log` is specified, a shortlog of the commits being merged
will be appended to the specified message.
-include::rerere-options.txt[]
+include::rerere-options.adoc[]
--overwrite-ignore::
--no-overwrite-ignore::
release/version name would be acceptable.
-include::merge-strategies.txt[]
+include::merge-strategies.adoc[]
CONFIGURATION
-------------
supported options are the same as those of `git merge`, but option
values containing whitespace characters are currently not supported.
-include::includes/cmd-config-section-rest.txt[]
+include::includes/cmd-config-section-rest.adoc[]
-include::config/merge.txt[]
+include::config/merge.adoc[]
SEE ALSO
--------
-------------
:git-mergetool: 1
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/mergetool.txt[]
+include::config/mergetool.adoc[]
TEMPORARY FILES
---------------
vimdiff
~~~~~~~
-include::mergetools/vimdiff.txt[]
+include::mergetools/vimdiff.adoc[]
GIT
---
This setting can be overridden through the environment and
command line.
-include::includes/cmd-config-section-rest.txt[]
+include::includes/cmd-config-section-rest.adoc[]
-include::config/notes.txt[]
+include::config/notes.adoc[]
ENVIRONMENT
:git-pull: 1
-include::merge-options.txt[]
+include::merge-options.adoc[]
-r::
--rebase[=(false|true|merges|interactive)]::
Options related to fetching
~~~~~~~~~~~~~~~~~~~~~~~~~~~
-include::fetch-options.txt[]
+include::fetch-options.adoc[]
-include::pull-fetch-param.txt[]
+include::pull-fetch-param.adoc[]
-include::urls-remotes.txt[]
+include::urls-remotes.adoc[]
-include::merge-strategies.txt[]
+include::merge-strategies.adoc[]
DEFAULT BEHAVIOUR
-----------------
would want to start over, you can recover with 'git reset'.
-include::transfer-data-leaks.txt[]
+include::transfer-data-leaks.adoc[]
BUGS
----
--ipv6::
Use IPv6 addresses only, ignoring IPv4 addresses.
-include::urls-remotes.txt[]
+include::urls-remotes.adoc[]
OUTPUT
------
and so would be unreachable. As such, these commits would be removed by
a `git gc` command on the origin repository.
-include::transfer-data-leaks.txt[]
+include::transfer-data-leaks.adoc[]
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/push.txt[]
+include::config/push.adoc[]
GIT
---
+
See also INCOMPATIBLE OPTIONS below.
-include::rerere-options.txt[]
+include::rerere-options.adoc[]
-S[<keyid>]::
--gpg-sign[=<keyid>]::
* State directories: The two backends keep their state in different
directories under `.git/`
-include::merge-strategies.txt[]
+include::merge-strategies.adoc[]
NOTES
-----
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/rebase.txt[]
-include::config/sequencer.txt[]
+include::config/rebase.adoc[]
+include::config/sequencer.adoc[]
GIT
---
--ref-format=<format>::
The ref format to migrate the ref store to. Can be one of:
+
-include::ref-storage-format.txt[]
+include::ref-storage-format.adoc[]
--dry-run::
Perform the migration, but do not modify the repository. The migrated
to. See "Specifying Ranges" in linkgit:git-rev-parse[1] and the
"Commit Limiting" options below.
-include::rev-list-options.txt[]
+include::rev-list-options.adoc[]
OUTPUT
------
-----------
:git-rev-list: 1
-include::rev-list-description.txt[]
+include::rev-list-description.adoc[]
'rev-list' is an essential Git command, since it
provides the ability to build and traverse commit ancestry graphs. For
-------
:git-rev-list: 1
-include::rev-list-options.txt[]
+include::rev-list-options.adoc[]
-include::pretty-formats.txt[]
+include::pretty-formats.adoc[]
EXAMPLES
--------
Flags and parameters to be parsed.
-include::revisions.txt[]
+include::revisions.adoc[]
PARSEOPT
--------
Pass the merge strategy-specific option through to the
merge strategy. See linkgit:git-merge[1] for details.
-include::rerere-options.txt[]
+include::rerere-options.adoc[]
--reference::
Instead of starting the body of the log message with "This
SEQUENCER SUBCOMMANDS
---------------------
-include::sequencer.txt[]
+include::sequencer.adoc[]
EXAMPLES
--------
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/revert.txt[]
+include::config/revert.adoc[]
SEE ALSO
--------
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/sendemail.txt[]
+include::config/sendemail.adoc[]
EXAMPLES
--------
options or the revision range, when confusion arises.
:git-shortlog: 1
-include::rev-list-options.txt[]
+include::rev-list-options.adoc[]
MAPPING AUTHORS
---------------
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/showbranch.txt[]
+include::config/showbranch.adoc[]
GIT
---
algorithm for the current repository (set by `extensions.objectFormat`), or
'sha1' if no value is set or outside a repository..
+
-include::object-format-disclaimer.txt[]
+include::object-format-disclaimer.adoc[]
GIT
---
For a more complete list of ways to spell object names, see
"SPECIFYING REVISIONS" section in linkgit:gitrevisions[7].
-include::pretty-options.txt[]
+include::pretty-options.adoc[]
-include::pretty-formats.txt[]
+include::pretty-formats.adoc[]
DIFF FORMATTING
:git-log: 1
:diff-merges-default: `dense-combined`
-include::diff-options.txt[]
+include::diff-options.adoc[]
-include::diff-generate-patch.txt[]
+include::diff-generate-patch.adoc[]
EXAMPLES
DISCUSSION
----------
-include::i18n.txt[]
+include::i18n.adoc[]
GIT
---
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/stash.txt[]
+include::config/stash.adoc[]
SEE ALSO
CONFIGURATION
-------------
-include::includes/cmd-config-section-all.txt[]
+include::includes/cmd-config-section-all.adoc[]
-include::config/checkout.txt[]
+include::config/checkout.adoc[]
SEE ALSO
--------
$ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1
------------
-include::date-formats.txt[]
+include::date-formats.adoc[]
FILES
-----
NOTES
-----
-include::ref-reachability-filters.txt[]
+include::ref-reachability-filters.adoc[]
SEE ALSO
--------
Main porcelain commands
~~~~~~~~~~~~~~~~~~~~~~~
-include::{build_dir}/cmds-mainporcelain.txt[]
+include::{build_dir}/cmds-mainporcelain.adoc[]
Ancillary Commands
~~~~~~~~~~~~~~~~~~
Manipulators:
-include::{build_dir}/cmds-ancillarymanipulators.txt[]
+include::{build_dir}/cmds-ancillarymanipulators.adoc[]
Interrogators:
-include::{build_dir}/cmds-ancillaryinterrogators.txt[]
+include::{build_dir}/cmds-ancillaryinterrogators.adoc[]
Interacting with Others
These commands are to interact with foreign SCM and with other
people via patch over e-mail.
-include::{build_dir}/cmds-foreignscminterface.txt[]
+include::{build_dir}/cmds-foreignscminterface.adoc[]
Reset, restore and revert
~~~~~~~~~~~~~~~~~~~~~~~~~
Manipulation commands
~~~~~~~~~~~~~~~~~~~~~
-include::{build_dir}/cmds-plumbingmanipulators.txt[]
+include::{build_dir}/cmds-plumbingmanipulators.adoc[]
Interrogation commands
~~~~~~~~~~~~~~~~~~~~~~
-include::{build_dir}/cmds-plumbinginterrogators.txt[]
+include::{build_dir}/cmds-plumbinginterrogators.adoc[]
In general, the interrogate commands do not touch the files in
the working tree.
Syncing repositories
~~~~~~~~~~~~~~~~~~~~
-include::{build_dir}/cmds-synchingrepositories.txt[]
+include::{build_dir}/cmds-synchingrepositories.adoc[]
The following are helper commands used by the above; end users
typically do not use them directly.
-include::{build_dir}/cmds-synchelpers.txt[]
+include::{build_dir}/cmds-synchelpers.adoc[]
Internal helper commands
These are internal helper commands used by other commands; end
users typically do not use them directly.
-include::{build_dir}/cmds-purehelpers.txt[]
+include::{build_dir}/cmds-purehelpers.adoc[]
Guides
------
The following documentation pages are guides about Git concepts.
-include::{build_dir}/cmds-guide.txt[]
+include::{build_dir}/cmds-guide.adoc[]
Repository, command and file interfaces
---------------------------------------
users are expected to interact with directly. See `--user-formats` in
linkgit:git-help[1] for more details on the criteria.
-include::{build_dir}/cmds-userinterfaces.txt[]
+include::{build_dir}/cmds-userinterfaces.adoc[]
File formats, protocols and other developer interfaces
------------------------------------------------------
other git developer interfaces. See `--developer-interfaces` in
linkgit:git-help[1].
-include::{build_dir}/cmds-developerinterfaces.txt[]
+include::{build_dir}/cmds-developerinterfaces.adoc[]
Configuration Mechanism
-----------------------
DESCRIPTION
-----------
-include::glossary-content.txt[]
+include::glossary-content.adoc[]
SEE ALSO
--------
(See "History simplification" in linkgit:git-log[1] for a more
detailed explanation.)
-include::line-range-options.txt[]
+include::line-range-options.adoc[]
<revision range>::
git clone ext::'git --namespace=foo %s /tmp/prefixed.git'
----------
-include::transfer-data-leaks.txt[]
+include::transfer-data-leaks.adoc[]
GIT
---
The exact configuration for pseudo-merges is as follows:
-include::config/bitmap-pseudo-merge.txt[]
+include::config/bitmap-pseudo-merge.adoc[]
=== Examples
worktrees/<id>/config.worktree::
Working directory specific configuration file.
-include::technical/repository-version.txt[]
+include::technical/repository-version.adoc[]
SEE ALSO
--------
other objects than commits, e.g. blobs ("files") or trees
("directories of files").
-include::revisions.txt[]
+include::revisions.adoc[]
SEE ALSO
T="$1"
for h in \
- *.txt *.html \
- howto/*.txt howto/*.html \
- technical/*.txt technical/*.html \
- RelNotes/*.txt *.css
+ *.adoc *.html \
+ howto/*.adoc howto/*.html \
+ technical/*.adoc technical/*.html \
+ RelNotes/*.adoc *.css
do
if test ! -f "$h"
then
done
strip_leading=$(echo "$T/" | sed -e 's|.|.|g')
for th in \
- "$T"/*.html "$T"/*.txt \
- "$T"/howto/*.txt "$T"/howto/*.html \
- "$T"/technical/*.txt "$T"/technical/*.html
+ "$T"/*.html "$T"/*.adoc \
+ "$T"/howto/*.adoc "$T"/howto/*.html \
+ "$T"/technical/*.adoc "$T"/technical/*.html
do
h=$(expr "$th" : "$strip_leading"'\(.*\)')
case "$h" in
- RelNotes-*.txt | index.html) continue ;;
+ RelNotes-*.adoc | index.html) continue ;;
esac
test -f "$h" && continue
echo >&2 "# rm -f $th"
(namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`,
`--name-only`, `--name-status`, `--check`) are not currently implemented.
+
-include::line-range-format.txt[]
+include::line-range-format.adoc[]
# Parse arguments, a simple state machine for input like:
#
-# <file-to-check.txt> <valid-files-to-link-to> --section=1 git.txt git-add.txt [...] --to-lint git-add.txt a-file.txt [...]
+# <file-to-check.adoc> <valid-files-to-link-to> --section=1 git.adoc git-add.adoc [...] --to-lint git-add.adoc a-file.adoc [...]
my %TXT;
my %SECTION;
my $section;
next;
}
- my ($name) = $arg =~ /^(.*?)\.txt$/s;
+ my ($name) = $arg =~ /^(.*?)\.adoc$/s;
unless (defined $section) {
$TXT{$name} = $arg;
next;
git-?*--?* ) continue ;;
esac
- if ! test -f "$v.txt"
+ if ! test -f "$v.adoc"
then
echo "no doc: $v"
ret=1
-e 's/[ ].*//' \
-e 's/^/listed /' ../command-list.txt
make print-man1 |
- grep '\.txt$' |
+ grep '\.adoc$' |
sed -e 's|^|documented |' \
- -e 's/\.txt//'
+ -e 's/\.adoc//'
) | (
all_commands="$(printf "%s " "$ALL_COMMANDS" "$BUILT_INS" "$EXCLUDED_PROGRAMS" | tr '\n' ' ')"
ret=0
With --no-log do not list one-line descriptions from the
actual commits being merged.
-include::signoff-option.txt[]
+include::signoff-option.adoc[]
--stat::
-n::
manpages = {
# Category 1.
- 'git-add.txt' : 1,
- 'git-am.txt' : 1,
- 'git-annotate.txt' : 1,
- 'git-apply.txt' : 1,
- 'git-archimport.txt' : 1,
- 'git-archive.txt' : 1,
- 'git-bisect.txt' : 1,
- 'git-blame.txt' : 1,
- 'git-branch.txt' : 1,
- 'git-bugreport.txt' : 1,
- 'git-bundle.txt' : 1,
- 'git-cat-file.txt' : 1,
- 'git-check-attr.txt' : 1,
- 'git-check-ignore.txt' : 1,
- 'git-check-mailmap.txt' : 1,
- 'git-checkout-index.txt' : 1,
- 'git-checkout.txt' : 1,
- 'git-check-ref-format.txt' : 1,
- 'git-cherry-pick.txt' : 1,
- 'git-cherry.txt' : 1,
- 'git-citool.txt' : 1,
- 'git-clean.txt' : 1,
- 'git-clone.txt' : 1,
- 'git-column.txt' : 1,
- 'git-commit-graph.txt' : 1,
- 'git-commit-tree.txt' : 1,
- 'git-commit.txt' : 1,
- 'git-config.txt' : 1,
- 'git-count-objects.txt' : 1,
- 'git-credential-cache--daemon.txt' : 1,
- 'git-credential-cache.txt' : 1,
- 'git-credential-store.txt' : 1,
- 'git-credential.txt' : 1,
- 'git-cvsexportcommit.txt' : 1,
- 'git-cvsimport.txt' : 1,
- 'git-cvsserver.txt' : 1,
- 'git-daemon.txt' : 1,
- 'git-describe.txt' : 1,
- 'git-diagnose.txt' : 1,
- 'git-diff-files.txt' : 1,
- 'git-diff-index.txt' : 1,
- 'git-difftool.txt' : 1,
- 'git-diff-tree.txt' : 1,
- 'git-diff.txt' : 1,
- 'git-fast-export.txt' : 1,
- 'git-fast-import.txt' : 1,
- 'git-fetch-pack.txt' : 1,
- 'git-fetch.txt' : 1,
- 'git-filter-branch.txt' : 1,
- 'git-fmt-merge-msg.txt' : 1,
- 'git-for-each-ref.txt' : 1,
- 'git-for-each-repo.txt' : 1,
- 'git-format-patch.txt' : 1,
- 'git-fsck-objects.txt' : 1,
- 'git-fsck.txt' : 1,
- 'git-fsmonitor--daemon.txt' : 1,
- 'git-gc.txt' : 1,
- 'git-get-tar-commit-id.txt' : 1,
- 'git-grep.txt' : 1,
- 'git-gui.txt' : 1,
- 'git-hash-object.txt' : 1,
- 'git-help.txt' : 1,
- 'git-hook.txt' : 1,
- 'git-http-backend.txt' : 1,
- 'git-http-fetch.txt' : 1,
- 'git-http-push.txt' : 1,
- 'git-imap-send.txt' : 1,
- 'git-index-pack.txt' : 1,
- 'git-init-db.txt' : 1,
- 'git-init.txt' : 1,
- 'git-instaweb.txt' : 1,
- 'git-interpret-trailers.txt' : 1,
- 'git-log.txt' : 1,
- 'git-ls-files.txt' : 1,
- 'git-ls-remote.txt' : 1,
- 'git-ls-tree.txt' : 1,
- 'git-mailinfo.txt' : 1,
- 'git-mailsplit.txt' : 1,
- 'git-maintenance.txt' : 1,
- 'git-merge-base.txt' : 1,
- 'git-merge-file.txt' : 1,
- 'git-merge-index.txt' : 1,
- 'git-merge-one-file.txt' : 1,
- 'git-mergetool--lib.txt' : 1,
- 'git-mergetool.txt' : 1,
- 'git-merge-tree.txt' : 1,
- 'git-merge.txt' : 1,
- 'git-mktag.txt' : 1,
- 'git-mktree.txt' : 1,
- 'git-multi-pack-index.txt' : 1,
- 'git-mv.txt' : 1,
- 'git-name-rev.txt' : 1,
- 'git-notes.txt' : 1,
- 'git-p4.txt' : 1,
- 'git-pack-objects.txt' : 1,
- 'git-pack-redundant.txt' : 1,
- 'git-pack-refs.txt' : 1,
- 'git-patch-id.txt' : 1,
- 'git-prune-packed.txt' : 1,
- 'git-prune.txt' : 1,
- 'git-pull.txt' : 1,
- 'git-push.txt' : 1,
- 'git-quiltimport.txt' : 1,
- 'git-range-diff.txt' : 1,
- 'git-read-tree.txt' : 1,
- 'git-rebase.txt' : 1,
- 'git-receive-pack.txt' : 1,
- 'git-reflog.txt' : 1,
- 'git-refs.txt' : 1,
- 'git-remote-ext.txt' : 1,
- 'git-remote-fd.txt' : 1,
- 'git-remote.txt' : 1,
- 'git-repack.txt' : 1,
- 'git-replace.txt' : 1,
- 'git-replay.txt' : 1,
- 'git-request-pull.txt' : 1,
- 'git-rerere.txt' : 1,
- 'git-reset.txt' : 1,
- 'git-restore.txt' : 1,
- 'git-revert.txt' : 1,
- 'git-rev-list.txt' : 1,
- 'git-rev-parse.txt' : 1,
- 'git-rm.txt' : 1,
- 'git-send-email.txt' : 1,
- 'git-send-pack.txt' : 1,
- 'git-shell.txt' : 1,
- 'git-sh-i18n--envsubst.txt' : 1,
- 'git-sh-i18n.txt' : 1,
- 'git-shortlog.txt' : 1,
- 'git-show-branch.txt' : 1,
- 'git-show-index.txt' : 1,
- 'git-show-ref.txt' : 1,
- 'git-show.txt' : 1,
- 'git-sh-setup.txt' : 1,
- 'git-sparse-checkout.txt' : 1,
- 'git-stage.txt' : 1,
- 'git-stash.txt' : 1,
- 'git-status.txt' : 1,
- 'git-stripspace.txt' : 1,
- 'git-submodule.txt' : 1,
- 'git-svn.txt' : 1,
- 'git-switch.txt' : 1,
- 'git-symbolic-ref.txt' : 1,
- 'git-tag.txt' : 1,
- 'git-unpack-file.txt' : 1,
- 'git-unpack-objects.txt' : 1,
- 'git-update-index.txt' : 1,
- 'git-update-ref.txt' : 1,
- 'git-update-server-info.txt' : 1,
- 'git-upload-archive.txt' : 1,
- 'git-upload-pack.txt' : 1,
- 'git-var.txt' : 1,
- 'git-verify-commit.txt' : 1,
- 'git-verify-pack.txt' : 1,
- 'git-verify-tag.txt' : 1,
- 'git-version.txt' : 1,
- 'git-web--browse.txt' : 1,
- 'git-whatchanged.txt' : 1,
- 'git-worktree.txt' : 1,
- 'git-write-tree.txt' : 1,
- 'git.txt' : 1,
- 'gitk.txt' : 1,
- 'gitweb.txt' : 1,
- 'scalar.txt' : 1,
+ 'git-add.adoc' : 1,
+ 'git-am.adoc' : 1,
+ 'git-annotate.adoc' : 1,
+ 'git-apply.adoc' : 1,
+ 'git-archimport.adoc' : 1,
+ 'git-archive.adoc' : 1,
+ 'git-bisect.adoc' : 1,
+ 'git-blame.adoc' : 1,
+ 'git-branch.adoc' : 1,
+ 'git-bugreport.adoc' : 1,
+ 'git-bundle.adoc' : 1,
+ 'git-cat-file.adoc' : 1,
+ 'git-check-attr.adoc' : 1,
+ 'git-check-ignore.adoc' : 1,
+ 'git-check-mailmap.adoc' : 1,
+ 'git-checkout-index.adoc' : 1,
+ 'git-checkout.adoc' : 1,
+ 'git-check-ref-format.adoc' : 1,
+ 'git-cherry-pick.adoc' : 1,
+ 'git-cherry.adoc' : 1,
+ 'git-citool.adoc' : 1,
+ 'git-clean.adoc' : 1,
+ 'git-clone.adoc' : 1,
+ 'git-column.adoc' : 1,
+ 'git-commit-graph.adoc' : 1,
+ 'git-commit-tree.adoc' : 1,
+ 'git-commit.adoc' : 1,
+ 'git-config.adoc' : 1,
+ 'git-count-objects.adoc' : 1,
+ 'git-credential-cache--daemon.adoc' : 1,
+ 'git-credential-cache.adoc' : 1,
+ 'git-credential-store.adoc' : 1,
+ 'git-credential.adoc' : 1,
+ 'git-cvsexportcommit.adoc' : 1,
+ 'git-cvsimport.adoc' : 1,
+ 'git-cvsserver.adoc' : 1,
+ 'git-daemon.adoc' : 1,
+ 'git-describe.adoc' : 1,
+ 'git-diagnose.adoc' : 1,
+ 'git-diff-files.adoc' : 1,
+ 'git-diff-index.adoc' : 1,
+ 'git-difftool.adoc' : 1,
+ 'git-diff-tree.adoc' : 1,
+ 'git-diff.adoc' : 1,
+ 'git-fast-export.adoc' : 1,
+ 'git-fast-import.adoc' : 1,
+ 'git-fetch-pack.adoc' : 1,
+ 'git-fetch.adoc' : 1,
+ 'git-filter-branch.adoc' : 1,
+ 'git-fmt-merge-msg.adoc' : 1,
+ 'git-for-each-ref.adoc' : 1,
+ 'git-for-each-repo.adoc' : 1,
+ 'git-format-patch.adoc' : 1,
+ 'git-fsck-objects.adoc' : 1,
+ 'git-fsck.adoc' : 1,
+ 'git-fsmonitor--daemon.adoc' : 1,
+ 'git-gc.adoc' : 1,
+ 'git-get-tar-commit-id.adoc' : 1,
+ 'git-grep.adoc' : 1,
+ 'git-gui.adoc' : 1,
+ 'git-hash-object.adoc' : 1,
+ 'git-help.adoc' : 1,
+ 'git-hook.adoc' : 1,
+ 'git-http-backend.adoc' : 1,
+ 'git-http-fetch.adoc' : 1,
+ 'git-http-push.adoc' : 1,
+ 'git-imap-send.adoc' : 1,
+ 'git-index-pack.adoc' : 1,
+ 'git-init-db.adoc' : 1,
+ 'git-init.adoc' : 1,
+ 'git-instaweb.adoc' : 1,
+ 'git-interpret-trailers.adoc' : 1,
+ 'git-log.adoc' : 1,
+ 'git-ls-files.adoc' : 1,
+ 'git-ls-remote.adoc' : 1,
+ 'git-ls-tree.adoc' : 1,
+ 'git-mailinfo.adoc' : 1,
+ 'git-mailsplit.adoc' : 1,
+ 'git-maintenance.adoc' : 1,
+ 'git-merge-base.adoc' : 1,
+ 'git-merge-file.adoc' : 1,
+ 'git-merge-index.adoc' : 1,
+ 'git-merge-one-file.adoc' : 1,
+ 'git-mergetool--lib.adoc' : 1,
+ 'git-mergetool.adoc' : 1,
+ 'git-merge-tree.adoc' : 1,
+ 'git-merge.adoc' : 1,
+ 'git-mktag.adoc' : 1,
+ 'git-mktree.adoc' : 1,
+ 'git-multi-pack-index.adoc' : 1,
+ 'git-mv.adoc' : 1,
+ 'git-name-rev.adoc' : 1,
+ 'git-notes.adoc' : 1,
+ 'git-p4.adoc' : 1,
+ 'git-pack-objects.adoc' : 1,
+ 'git-pack-redundant.adoc' : 1,
+ 'git-pack-refs.adoc' : 1,
+ 'git-patch-id.adoc' : 1,
+ 'git-prune-packed.adoc' : 1,
+ 'git-prune.adoc' : 1,
+ 'git-pull.adoc' : 1,
+ 'git-push.adoc' : 1,
+ 'git-quiltimport.adoc' : 1,
+ 'git-range-diff.adoc' : 1,
+ 'git-read-tree.adoc' : 1,
+ 'git-rebase.adoc' : 1,
+ 'git-receive-pack.adoc' : 1,
+ 'git-reflog.adoc' : 1,
+ 'git-refs.adoc' : 1,
+ 'git-remote-ext.adoc' : 1,
+ 'git-remote-fd.adoc' : 1,
+ 'git-remote.adoc' : 1,
+ 'git-repack.adoc' : 1,
+ 'git-replace.adoc' : 1,
+ 'git-replay.adoc' : 1,
+ 'git-request-pull.adoc' : 1,
+ 'git-rerere.adoc' : 1,
+ 'git-reset.adoc' : 1,
+ 'git-restore.adoc' : 1,
+ 'git-revert.adoc' : 1,
+ 'git-rev-list.adoc' : 1,
+ 'git-rev-parse.adoc' : 1,
+ 'git-rm.adoc' : 1,
+ 'git-send-email.adoc' : 1,
+ 'git-send-pack.adoc' : 1,
+ 'git-shell.adoc' : 1,
+ 'git-sh-i18n--envsubst.adoc' : 1,
+ 'git-sh-i18n.adoc' : 1,
+ 'git-shortlog.adoc' : 1,
+ 'git-show-branch.adoc' : 1,
+ 'git-show-index.adoc' : 1,
+ 'git-show-ref.adoc' : 1,
+ 'git-show.adoc' : 1,
+ 'git-sh-setup.adoc' : 1,
+ 'git-sparse-checkout.adoc' : 1,
+ 'git-stage.adoc' : 1,
+ 'git-stash.adoc' : 1,
+ 'git-status.adoc' : 1,
+ 'git-stripspace.adoc' : 1,
+ 'git-submodule.adoc' : 1,
+ 'git-svn.adoc' : 1,
+ 'git-switch.adoc' : 1,
+ 'git-symbolic-ref.adoc' : 1,
+ 'git-tag.adoc' : 1,
+ 'git-unpack-file.adoc' : 1,
+ 'git-unpack-objects.adoc' : 1,
+ 'git-update-index.adoc' : 1,
+ 'git-update-ref.adoc' : 1,
+ 'git-update-server-info.adoc' : 1,
+ 'git-upload-archive.adoc' : 1,
+ 'git-upload-pack.adoc' : 1,
+ 'git-var.adoc' : 1,
+ 'git-verify-commit.adoc' : 1,
+ 'git-verify-pack.adoc' : 1,
+ 'git-verify-tag.adoc' : 1,
+ 'git-version.adoc' : 1,
+ 'git-web--browse.adoc' : 1,
+ 'git-whatchanged.adoc' : 1,
+ 'git-worktree.adoc' : 1,
+ 'git-write-tree.adoc' : 1,
+ 'git.adoc' : 1,
+ 'gitk.adoc' : 1,
+ 'gitweb.adoc' : 1,
+ 'scalar.adoc' : 1,
# Category 5.
- 'gitattributes.txt' : 5,
- 'gitformat-bundle.txt' : 5,
- 'gitformat-chunk.txt' : 5,
- 'gitformat-commit-graph.txt' : 5,
- 'gitformat-index.txt' : 5,
- 'gitformat-pack.txt' : 5,
- 'gitformat-signature.txt' : 5,
- 'githooks.txt' : 5,
- 'gitignore.txt' : 5,
- 'gitmailmap.txt' : 5,
- 'gitmodules.txt' : 5,
- 'gitprotocol-capabilities.txt' : 5,
- 'gitprotocol-common.txt' : 5,
- 'gitprotocol-http.txt' : 5,
- 'gitprotocol-pack.txt' : 5,
- 'gitprotocol-v2.txt' : 5,
- 'gitrepository-layout.txt' : 5,
- 'gitweb.conf.txt' : 5,
+ 'gitattributes.adoc' : 5,
+ 'gitformat-bundle.adoc' : 5,
+ 'gitformat-chunk.adoc' : 5,
+ 'gitformat-commit-graph.adoc' : 5,
+ 'gitformat-index.adoc' : 5,
+ 'gitformat-pack.adoc' : 5,
+ 'gitformat-signature.adoc' : 5,
+ 'githooks.adoc' : 5,
+ 'gitignore.adoc' : 5,
+ 'gitmailmap.adoc' : 5,
+ 'gitmodules.adoc' : 5,
+ 'gitprotocol-capabilities.adoc' : 5,
+ 'gitprotocol-common.adoc' : 5,
+ 'gitprotocol-http.adoc' : 5,
+ 'gitprotocol-pack.adoc' : 5,
+ 'gitprotocol-v2.adoc' : 5,
+ 'gitrepository-layout.adoc' : 5,
+ 'gitweb.conf.adoc' : 5,
# Category 7.
- 'gitcli.txt' : 7,
- 'gitcore-tutorial.txt' : 7,
- 'gitcredentials.txt' : 7,
- 'gitcvs-migration.txt' : 7,
- 'gitdiffcore.txt' : 7,
- 'giteveryday.txt' : 7,
- 'gitfaq.txt' : 7,
- 'gitglossary.txt' : 7,
- 'gitpacking.txt' : 7,
- 'gitnamespaces.txt' : 7,
- 'gitremote-helpers.txt' : 7,
- 'gitrevisions.txt' : 7,
- 'gitsubmodules.txt' : 7,
- 'gittutorial-2.txt' : 7,
- 'gittutorial.txt' : 7,
- 'gitworkflows.txt' : 7,
+ 'gitcli.adoc' : 7,
+ 'gitcore-tutorial.adoc' : 7,
+ 'gitcredentials.adoc' : 7,
+ 'gitcvs-migration.adoc' : 7,
+ 'gitdiffcore.adoc' : 7,
+ 'giteveryday.adoc' : 7,
+ 'gitfaq.adoc' : 7,
+ 'gitglossary.adoc' : 7,
+ 'gitpacking.adoc' : 7,
+ 'gitnamespaces.adoc' : 7,
+ 'gitremote-helpers.adoc' : 7,
+ 'gitrevisions.adoc' : 7,
+ 'gitsubmodules.adoc' : 7,
+ 'gittutorial-2.adoc' : 7,
+ 'gittutorial.adoc' : 7,
+ 'gitworkflows.adoc' : 7,
}
docs_backend = get_option('docs_backend')
xmlto = find_program('xmlto')
cmd_lists = [
- 'cmds-ancillaryinterrogators.txt',
- 'cmds-ancillarymanipulators.txt',
- 'cmds-mainporcelain.txt',
- 'cmds-plumbinginterrogators.txt',
- 'cmds-plumbingmanipulators.txt',
- 'cmds-synchingrepositories.txt',
- 'cmds-synchelpers.txt',
- 'cmds-guide.txt',
- 'cmds-developerinterfaces.txt',
- 'cmds-userinterfaces.txt',
- 'cmds-purehelpers.txt',
- 'cmds-foreignscminterface.txt',
+ 'cmds-ancillaryinterrogators.adoc',
+ 'cmds-ancillarymanipulators.adoc',
+ 'cmds-mainporcelain.adoc',
+ 'cmds-plumbinginterrogators.adoc',
+ 'cmds-plumbingmanipulators.adoc',
+ 'cmds-synchingrepositories.adoc',
+ 'cmds-synchelpers.adoc',
+ 'cmds-guide.adoc',
+ 'cmds-developerinterfaces.adoc',
+ 'cmds-userinterfaces.adoc',
+ 'cmds-purehelpers.adoc',
+ 'cmds-foreignscminterface.adoc',
]
documentation_deps += custom_target(
'MERGE_TOOLS_DIR=' + meson.project_source_root() / 'mergetools',
],
input: 'generate-mergetool-list.sh',
- output: 'mergetools-' + mode + '.txt',
+ output: 'mergetools-' + mode + '.adoc',
)
endforeach
'--out-file=@OUTPUT@',
'@INPUT@',
],
- input: 'user-manual.txt',
+ input: 'user-manual.adoc',
output: 'user-manual.xml',
depends: documentation_deps,
)
)
articles = [
- 'DecisionMaking.txt',
- 'MyFirstContribution.txt',
- 'MyFirstObjectWalk.txt',
- 'ReviewingGuidelines.txt',
+ 'DecisionMaking.adoc',
+ 'MyFirstContribution.adoc',
+ 'MyFirstObjectWalk.adoc',
+ 'ReviewingGuidelines.adoc',
'SubmittingPatches',
- 'ToolsForGit.txt',
- 'git-bisect-lk2009.txt',
- 'git-tools.txt',
+ 'ToolsForGit.adoc',
+ 'git-bisect-lk2009.adoc',
+ 'git-tools.adoc',
]
foreach article : articles
# Sanity check that we are not missing any tests present in 't/'. This check
# only runs once at configure time and is thus best-effort, only. Furthermore,
# it only verifies man pages for the sake of simplicity.
-configured_manpages = manpages.keys() + [ 'git-bisect-lk2009.txt', 'git-tools.txt' ]
-actual_manpages = run_command(shell, '-c', 'ls git*.txt scalar.txt',
+configured_manpages = manpages.keys() + [ 'git-bisect-lk2009.adoc', 'git-tools.adoc' ]
+actual_manpages = run_command(shell, '-c', 'ls git*.adoc scalar.adoc',
check: true,
env: script_environment,
).stdout().strip().split('\n')
linkgit:git-show[1], and linkgit:git-whatchanged[1]
endif::git-rev-list[]
-include::pretty-options.txt[]
+include::pretty-options.adoc[]
--relative-date::
Synonym for `--date=relative`.
cd "$SOURCE_DIR"
c=////////////////////////////////////////////////////////////////
- skel=api-index-skel.txt
+ skel=api-index-skel.adoc
sed -e '/^\/\/ table of contents begin/q' "$skel"
echo "$c"
- ls api-*.txt |
+ ls api-*.adoc |
while read filename
do
case "$filename" in
- api-index-skel.txt | api-index.txt) continue ;;
+ api-index-skel.adoc | api-index.adoc) continue ;;
esac
title=$(sed -e 1q "$filename")
- html=${filename%.txt}.html
+ html=${filename%.adoc}.html
echo "* link:$html[$title]"
done
echo "$c"
To enable a target, set the corresponding environment variable or
system or global config value to one of the following:
-include::../trace2-target-values.txt[]
+include::../trace2-target-values.adoc[]
When trace files are written to a target directory, they will be named according
to the last component of the SID (optionally followed by a counter to avoid
-include::urls.txt[]
+include::urls.adoc[]
REMOTES[[REMOTES]]
------------------
[[git-explained]]
=== Git explained
-include::glossary-content.txt[]
+include::glossary-content.adoc[]
[[git-quick-start]]
[appendix]
config-list.h: generate-configlist.sh
-config-list.h: Documentation/*config.txt Documentation/config/*.txt
+config-list.h: Documentation/*config.adoc Documentation/config/*.adoc
$(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh . $@
command-list.h: generate-cmdlist.sh command-list.txt
-command-list.h: $(wildcard Documentation/git*.txt)
+command-list.h: $(wildcard Documentation/git*.adoc)
$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh \
$(patsubst %,--exclude-program %,$(EXCLUDED_PROGRAMS)) \
. $@
-hook-list.h: generate-hooklist.sh Documentation/githooks.txt
+hook-list.h: generate-hooklist.sh Documentation/githooks.adoc
$(QUIET_GEN)$(SHELL_PATH) ./generate-hooklist.sh . $@
SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):\
-Documentation/RelNotes/2.49.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.49.0.adoc
\ No newline at end of file
break
;;
esac
- done <"$1/Documentation/$cmd.txt"
+ done <"$1/Documentation/$cmd.adoc"
printf '\t{ "%s", N_("%s"), 0' "$cmd" "$synopsis"
printf " | CAT_%s" $rest
cat <<EOF
static const char *config_name_list[] = {
EOF
- grep -h '^[a-zA-Z].*\..*::$' "$SOURCE_DIR"/Documentation/*config.txt "$SOURCE_DIR"/Documentation/config/*.txt |
+ grep -h '^[a-zA-Z].*\..*::$' "$SOURCE_DIR"/Documentation/*config.adoc "$SOURCE_DIR"/Documentation/config/*.adoc |
sed '/deprecated/d; s/::$//; s/, */\n/g' |
sort |
sed 's/^.*$/ "&",/'
sed -n \
-e '/^~~~~*$/ {x; s/^.*$/ "&",/; p;}' \
-e 'x' \
- <"$SOURCE_DIR"/Documentation/githooks.txt |
+ <"$SOURCE_DIR"/Documentation/githooks.adoc |
LC_ALL=C sort
cat <<EOF
)
libgit_sources += custom_target(
- input: 'Documentation/githooks.txt',
+ input: 'Documentation/githooks.adoc',
output: 'hook-list.h',
command: [
shell,
projects / rit / commitdiff