Jonathan Nieder 68595cd442 fast-import: clarify documentation of "feature" command ...

The "feature" command allows streams to specify options for the import
that must not be ignored.  Logically, they are part of the stream,
even though technically most supported features are synonyms to
command-line options.

Make this more obvious by being more explicit about how the analogy
between most "feature" commands and command-line options works.  Treat
the feature (import-marks) that does not fit this analogy separately.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2011-02-09 16:06:47 -08:00

..

howto

…

pt_BR

…

RelNotes

Git 1.7.0.9

2010-12-15 11:38:19 -08:00

technical

pack-protocol.txt: fix pkt-line lengths

2010-04-04 10:18:21 -07:00

.gitattributes

…

.gitignore

Documentation: Avoid use of xmlto --stringparam

2009-12-05 10:03:49 -08:00

asciidoc.conf

…

blame-options.txt

blame documentation: -M/-C notice copied lines as well as moved ones

2010-04-11 12:17:42 -07:00

build-docdep.perl

…

cat-texi.perl

…

cmd-list.perl

…

CodingGuidelines

…

config.txt

add: introduce add.ignoreerrors synonym for add.ignore-errors

2010-12-01 13:40:12 -08:00

date-formats.txt

Document date formats accepted by parse_date()

2009-12-03 12:41:37 -08:00

diff-format.txt

Fix typos in technical documentation.

2010-01-31 10:24:53 -08:00

diff-generate-patch.txt

…

diff-options.txt

Documentation: Describe other situations where -z affects git diff

2010-04-18 13:43:53 -07:00

docbook-xsl.css

…

docbook.xsl

…

everyday.txt

…

fetch-options.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

fix-texi.perl

…

git-add.txt

Merge branch 'maint'

2010-02-08 21:54:10 -08:00

git-am.txt

Merge branch 'maint-1.6.6' into maint

2010-03-04 22:24:25 -08:00

git-annotate.txt

…

git-apply.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-archimport.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-archive.txt

Documentation/git-archive: spell --worktree-attributes correctly

2011-01-10 09:07:24 -08:00

git-bisect-lk2009.txt

Fix typos in technical documentation.

2010-01-31 10:24:53 -08:00

git-bisect.txt

…

git-blame.txt

Merge remote branch 'remotes/trast-doc/for-next'

2010-01-20 20:28:49 -08:00

git-branch.txt

Document new "already-merged" rule for branch -d

2010-04-15 00:53:40 -07:00

git-bundle.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-cat-file.txt

…

git-check-attr.txt

…

git-check-ref-format.txt

docs: don't talk about $GIT_DIR/refs/ everywhere

2010-02-17 21:40:09 -08:00

git-checkout-index.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-checkout.txt

…

git-cherry-pick.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-cherry.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-citool.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-clean.txt

git-clean: fix the description of the default behavior

2010-02-04 15:12:13 -08:00

git-clone.txt

Merge branch 'maint-1.6.6' into maint

2010-03-21 17:00:22 -07:00

git-commit-tree.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-commit.txt

Documentation: Fix indentation problem in git-commit(1)

2010-02-19 19:03:24 -08:00

git-config.txt

Merge remote branch 'remotes/trast-doc/for-next'

2010-01-20 20:28:49 -08:00

git-count-objects.txt

…

git-cvsexportcommit.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-cvsimport.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-cvsserver.txt

Merge remote branch 'remotes/trast-doc/for-next'

2010-01-20 20:28:49 -08:00

git-daemon.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-describe.txt

Documentation: explain the meaning of "-g" in git-describe output

2010-03-24 11:31:45 -07:00

git-diff-files.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-diff-index.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-diff-tree.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-diff.txt

git-diff.txt: Link to git-difftool

2010-01-09 22:41:31 -08:00

git-difftool.txt

Merge remote branch 'remotes/trast-doc/for-next'

2010-01-20 20:28:49 -08:00

git-fast-export.txt

Fix typos in technical documentation.

2010-01-31 10:24:53 -08:00

git-fast-import.txt

fast-import: clarify documentation of "feature" command

2011-02-09 16:06:47 -08:00

git-fetch-pack.txt

Documentation: describe --thin more accurately

2010-02-18 17:13:18 -08:00

git-fetch.txt

fetch/push: fix usage strings

2010-04-09 21:23:10 -07:00

git-filter-branch.txt

docs: fix filter-branch example for quoted paths

2010-02-06 10:52:14 -08:00

git-fmt-merge-msg.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-for-each-ref.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-format-patch.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-fsck-objects.txt

…

git-fsck.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-gc.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-get-tar-commit-id.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-grep.txt

grep docs: document --no-index option

2010-02-25 22:41:44 -08:00

git-gui.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-hash-object.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-help.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-http-backend.txt

Documentation: Clarify support for smart HTTP backend

2010-03-30 16:49:19 -07:00

git-http-fetch.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-http-push.txt

…

git-imap-send.txt

imap-send: Remove limitation on message body

2010-03-24 11:00:25 -07:00

git-index-pack.txt

Documentation: describe --thin more accurately

2010-02-18 17:13:18 -08:00

git-init-db.txt

…

git-init.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-instaweb.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-log.txt

Merge branch 'il/rev-glob'

2010-01-22 16:08:16 -08:00

git-lost-found.txt

…

git-ls-files.txt

Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trast

2010-01-24 10:58:57 -08:00

git-ls-remote.txt

…

git-ls-tree.txt

Documentation: format full commands in typewriter font

2010-01-10 13:01:25 +01:00

git-mailinfo.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-mailsplit.txt

…

git-merge-base.txt

…

git-merge-file.txt

Merge branch 'ap/merge-backend-opts'

2010-01-20 20:28:50 -08:00

git-merge-index.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-merge-one-file.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-merge-tree.txt

…

git-merge.txt

Docs: Add -X option to git-merge's synopsis.

2010-04-12 09:50:09 -07:00

git-mergetool--lib.txt

…

git-mergetool.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-mktag.txt

…

git-mktree.txt

…

git-mv.txt

…

git-name-rev.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-notes.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-pack-objects.txt

pack-objects documentation: Fix --honor-pack-keep as well.

2010-02-24 19:10:22 -08:00

git-pack-redundant.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-pack-refs.txt

…

git-parse-remote.txt

…

git-patch-id.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-peek-remote.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-prune-packed.txt

…

git-prune.txt

docs: don't talk about $GIT_DIR/refs/ everywhere

2010-02-17 21:40:09 -08:00

git-pull.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-push.txt

fetch/push: fix usage strings

2010-04-09 21:23:10 -07:00

git-quiltimport.txt

…

git-read-tree.txt

Documentation/git-read-tree: clarify 2-tree merge

2010-03-15 15:25:17 -07:00

git-rebase.txt

git-rebase.txt: Fix spelling

2010-01-21 15:02:45 -08:00

git-receive-pack.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-reflog.txt

Merge branch 'maint-1.6.6' into maint

2010-03-21 17:00:22 -07:00

git-relink.txt

…

git-remote-helpers.txt

Fix typos in technical documentation.

2010-01-31 10:24:53 -08:00

git-remote.txt

Merge branch 'il/remote-updates'

2010-01-22 16:08:07 -08:00

git-repack.txt

update git-repack documentation wrt repack.UseDeltaBaseOffset

2010-02-04 15:12:16 -08:00

git-replace.txt

Documentation: format full commands in typewriter font

2010-01-10 13:01:25 +01:00

git-repo-config.txt

…

git-request-pull.txt

request-pull.txt: Document -p option

2010-07-25 21:52:19 -07:00

git-rerere.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-reset.txt

Merge remote branch 'remotes/trast-doc/for-next'

2010-01-20 20:28:49 -08:00

git-rev-list.txt

Documentation: rev-list: fix synopsys for --tags and and --remotes

2010-01-23 11:26:46 -08:00

git-rev-parse.txt

Merge branch 'gb/maint-submodule-env' into maint

2010-03-08 00:36:02 -08:00

git-revert.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-rm.txt

git-rm doc: Describe how to sync index & work tree

2010-01-07 15:37:33 -08:00

git-send-email.txt

Merge branch 'jc/1.7.0-send-email-no-thread-default'

2009-12-26 14:03:17 -08:00

git-send-pack.txt

Documentation: describe --thin more accurately

2010-02-18 17:13:18 -08:00

git-sh-setup.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-shell.txt

…

git-shortlog.txt

Documentation: emphasise 'git shortlog' in its synopsis

2010-01-10 21:29:34 +01:00

git-show-branch.txt

docs: don't talk about $GIT_DIR/refs/ everywhere

2010-02-17 21:40:09 -08:00

git-show-index.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-show-ref.txt

Documentation: show-ref <pattern>s are optional

2010-03-31 14:22:17 -07:00

git-show.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-stage.txt

…

git-stash.txt

docs: don't talk about $GIT_DIR/refs/ everywhere

2010-02-17 21:40:09 -08:00

git-status.txt

Documentation improvements for the description of short format.

2010-04-23 12:33:41 -07:00

git-stripspace.txt

…

git-submodule.txt

Fix typos in technical documentation.

2010-01-31 10:24:53 -08:00

git-svn.txt

git-svn: allow subset of branches/tags to be specified in glob spec

2010-01-23 03:23:04 -08:00

git-symbolic-ref.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-tag.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-tar-tree.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-tools.txt

…

git-unpack-file.txt

…

git-unpack-objects.txt

…

git-update-index.txt

Merge remote branch 'remotes/trast-doc/for-next'

2010-01-20 20:28:49 -08:00

git-update-ref.txt

…

git-update-server-info.txt

…

git-upload-archive.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-upload-pack.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-var.txt

Fix 'git var' usage synopsis

2010-02-14 18:23:16 -08:00

git-verify-pack.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-verify-tag.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-web--browse.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-whatchanged.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git-write-tree.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

git.txt

Git 1.7.0.7

2010-07-27 14:09:11 -07:00

gitattributes.txt

Documentation: mention conflict marker size argument (%L) for merge driver

2010-02-23 13:11:28 -08:00

gitcli.txt

…

gitcore-tutorial.txt

Merge remote branch 'remotes/trast-doc/for-next'

2010-01-20 20:28:49 -08:00

gitcvs-migration.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

gitdiffcore.txt

Merge branch 'maint-1.6.6' into maint

2010-03-21 17:00:22 -07:00

gitglossary.txt

…

githooks.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

gitignore.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

gitk.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

gitmodules.txt

…

gitrepository-layout.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

gittutorial-2.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

gittutorial.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

gitworkflows.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

glossary-content.txt

…

howto-index.sh

…

i18n.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

install-doc-quick.sh

…

install-webdoc.sh

…

mailmap.txt

…

Makefile

Documentation/Makefile: fix interrupted builds of user-manual.xml

2010-04-21 23:46:51 -07:00

manpage-1.72.xsl

…

manpage-base-url.xsl.in

Documentation: Avoid use of xmlto --stringparam

2009-12-05 10:03:49 -08:00

manpage-base.xsl

…

manpage-bold-literal.xsl

…

manpage-normal.xsl

…

manpage-quote-apos.xsl

…

manpage-suppress-sp.xsl

…

merge-config.txt

…

merge-options.txt

Docs: Add -X option to git-merge's synopsis.

2010-04-12 09:50:09 -07:00

merge-strategies.txt

Document that merge strategies can now take their own options

2010-01-17 22:46:28 -08:00

pretty-formats.txt

strbuf_expand: convert "%%" to "%"

2010-01-14 09:24:42 -08:00

pretty-options.txt

Fix "log --oneline" not to show notes

2010-01-21 14:57:41 -08:00

pull-fetch-param.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

RelNotes-1.5.0.1.txt

…

RelNotes-1.5.0.2.txt

…

RelNotes-1.5.0.3.txt

…

RelNotes-1.5.0.4.txt

…

RelNotes-1.5.0.5.txt

…

RelNotes-1.5.0.6.txt

…

RelNotes-1.5.0.7.txt

…

RelNotes-1.5.0.txt

…

RelNotes-1.5.1.1.txt

…

RelNotes-1.5.1.2.txt

…

RelNotes-1.5.1.3.txt

…

RelNotes-1.5.1.4.txt

…

RelNotes-1.5.1.5.txt

…

RelNotes-1.5.1.6.txt

…

RelNotes-1.5.1.txt

…

RelNotes-1.5.2.1.txt

…

RelNotes-1.5.2.2.txt

…

RelNotes-1.5.2.3.txt

…

RelNotes-1.5.2.4.txt

…

RelNotes-1.5.2.5.txt

…

RelNotes-1.5.2.txt

…

RelNotes-1.5.3.1.txt

…

RelNotes-1.5.3.2.txt

…

RelNotes-1.5.3.3.txt

…

RelNotes-1.5.3.4.txt

…

RelNotes-1.5.3.5.txt

…

RelNotes-1.5.3.6.txt

…

RelNotes-1.5.3.7.txt

…

RelNotes-1.5.3.8.txt

…

RelNotes-1.5.3.txt

…

RelNotes-1.5.4.1.txt

…

RelNotes-1.5.4.2.txt

…

RelNotes-1.5.4.3.txt

…

RelNotes-1.5.4.4.txt

…

RelNotes-1.5.4.5.txt

…

RelNotes-1.5.4.6.txt

…

RelNotes-1.5.4.7.txt

…

RelNotes-1.5.4.txt

…

RelNotes-1.5.5.1.txt

…

RelNotes-1.5.5.2.txt

…

RelNotes-1.5.5.3.txt

…

RelNotes-1.5.5.4.txt

…

RelNotes-1.5.5.5.txt

…

RelNotes-1.5.5.6.txt

…

RelNotes-1.5.5.txt

…

RelNotes-1.5.6.1.txt

…

RelNotes-1.5.6.2.txt

…

RelNotes-1.5.6.3.txt

…

RelNotes-1.5.6.4.txt

…

RelNotes-1.5.6.5.txt

…

RelNotes-1.5.6.6.txt

…

RelNotes-1.5.6.txt

…

RelNotes-1.6.0.1.txt

…

RelNotes-1.6.0.2.txt

…

RelNotes-1.6.0.3.txt

…

RelNotes-1.6.0.4.txt

…

RelNotes-1.6.0.5.txt

…

RelNotes-1.6.0.6.txt

…

RelNotes-1.6.0.txt

…

RelNotes-1.6.1.1.txt

…

RelNotes-1.6.1.2.txt

…

RelNotes-1.6.1.3.txt

…

RelNotes-1.6.1.4.txt

…

RelNotes-1.6.1.txt

…

RelNotes-1.6.2.1.txt

…

RelNotes-1.6.2.2.txt

…

RelNotes-1.6.2.3.txt

…

RelNotes-1.6.2.4.txt

…

RelNotes-1.6.2.5.txt

…

RelNotes-1.6.2.txt

…

RelNotes-1.6.3.1.txt

…

RelNotes-1.6.3.2.txt

…

RelNotes-1.6.3.3.txt

…

RelNotes-1.6.3.4.txt

…

RelNotes-1.6.3.txt

…

RelNotes-1.6.4.1.txt

…

RelNotes-1.6.4.2.txt

…

RelNotes-1.6.4.3.txt

…

RelNotes-1.6.4.4.txt

…

RelNotes-1.6.4.txt

…

RelNotes-1.6.5.1.txt

…

RelNotes-1.6.5.2.txt

…

RelNotes-1.6.5.3.txt

…

RelNotes-1.6.5.4.txt

Prepare for 1.6.5.4

2009-12-02 10:29:00 -08:00

RelNotes-1.6.5.5.txt

Git 1.6.5.5

2009-12-05 11:08:35 -08:00

RelNotes-1.6.5.6.txt

Git 1.6.5.6

2009-12-10 15:42:30 -08:00

RelNotes-1.6.5.7.txt

Git 1.6.5.7

2009-12-16 12:45:25 -08:00

RelNotes-1.6.5.8.txt

Git 1.6.5.8

2010-01-20 12:44:59 -08:00

RelNotes-1.6.5.txt

…

RelNotes-1.6.6.1.txt

Git 1.6.6.1

2010-01-20 13:29:21 -08:00

RelNotes-1.6.6.2.txt

Fix typo in 1.6.6.2 release notes

2010-02-12 15:40:01 -08:00

RelNotes-1.6.6.txt

Git 1.6.6

2009-12-23 12:23:11 -08:00

RelNotes-1.7.0.1.txt

Git 1.7.0.1

2010-02-28 11:41:24 -08:00

RelNotes-1.7.0.2.txt

Git 1.7.0.2

2010-03-07 11:07:51 -08:00

RelNotes-1.7.0.3.txt

Git 1.7.0.3

2010-03-21 17:01:22 -07:00

RelNotes-1.7.0.4.txt

Git 1.7.0.4

2010-03-31 15:12:08 -07:00

RelNotes-1.7.0.5.txt

Git 1.7.0.5

2010-04-11 13:42:33 -07:00

RelNotes-1.7.0.6.txt

Git 1.7.0.6

2010-04-22 23:04:21 -07:00

RelNotes-1.7.0.7.txt

Git 1.7.0.7

2010-07-27 14:09:11 -07:00

RelNotes-1.7.0.txt

Git 1.7.0

2010-02-12 15:45:05 -08:00

rev-list-options.txt

docs: don't talk about $GIT_DIR/refs/ everywhere

2010-02-17 21:40:09 -08:00

SubmittingPatches

SubmittingPatches: hints to know the status of a submitted patch.

2009-12-31 14:46:08 -08:00

urls-remotes.txt

Documentation: spell 'git cmd' without dash throughout

2010-01-10 13:01:28 +01:00

urls.txt

Documentation/urls: Remove spurious example markers

2010-03-21 14:42:24 -07:00

user-manual.conf

…

user-manual.txt

Updates for dirty submodules in release notes and user manual

2010-02-01 12:08:12 -08:00