Peter Eriksen 497171e765 Documentation: --amend cannot be combined with -c/-C/-F. ...

We used to get the following confusing error message:

    $ git commit --amend -a -m foo
    Option -m cannot be combined with -c/-C/-F

This is because --amend cannot be combined with -c/-C/-F, which makes
sense, because they try to handle the same log message in different ways.
So update the documentation to reflect this.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>

2007-01-24 15:32:52 -08:00

..

howto

git-format-patch: the default suffix is now .patch, not .txt

2007-01-17 23:48:20 -08:00

technical

Update send-pack pipeline documentation.

2007-01-01 14:35:16 -08:00

.gitignore

Stop ignoring Documentation/README

2007-01-20 19:10:26 -08:00

asciidoc.conf

escape tilde in Documentation/git-rev-parse.txt

2006-10-03 01:04:19 -07:00

build-docdep.perl

…

callouts.xsl

spurious .sp in manpages

2006-12-13 09:41:18 -08:00

cmd-list.perl

Documentation/git.txt: command re-classification

2007-01-19 17:53:39 -08:00

config.txt

Documentation/config.txt: Correct info about subsection name

2007-01-24 15:30:37 -08:00

core-intro.txt

sanitize content of README file

2007-01-17 12:03:50 -08:00

core-tutorial.txt

Documentation: merge-output is not too verbose now.

2007-01-14 21:31:30 -08:00

cvs-migration.txt

use 'init' instead of 'init-db' for shipped docs and tools

2007-01-12 13:36:16 -08:00

diff-format.txt

Update documentation to remove incorrect GIT_DIFF_OPTS example.

2006-11-27 12:08:36 -08:00

diff-options.txt

Document --numstat in git-apply and git-diff

2006-12-26 00:15:26 -08:00

diffcore.txt

…

everyday.txt

some doc updates

2007-01-14 21:12:14 -08:00

fetch-options.txt

Update clone/fetch documentation with --depth (shallow clone) option

2007-01-01 15:08:06 -08:00

git-add.txt

Make a short-and-sweet "git-add -i" synonym for "git-add --interactive"

2007-01-17 10:52:36 -08:00

git-am.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-annotate.txt

Add git-annotate(1) and git-blame(1)

2006-04-18 12:06:55 -07:00

git-apply.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-applymbox.txt

-u is now default for 'git-applymbox'

2007-01-09 21:20:39 -08:00

git-applypatch.txt

Documentation: suggest corresponding Porcelain-level in plumbing docs.

2007-01-17 13:03:29 -08:00

git-archimport.txt

git/Documentation: fix SYNOPSIS style bugs

2006-03-05 17:02:02 -08:00

git-archive.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-bisect.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-blame.txt

Documentation: m can be relative in "git-blame -Ln,m"

2007-01-17 13:04:15 -08:00

git-branch.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-cat-file.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-check-ref-format.txt

Some doc typo fixes

2006-06-07 11:49:35 -07:00

git-checkout-index.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-checkout.txt

Documentation: detached HEAD

2007-01-17 10:43:50 -08:00

git-cherry-pick.txt

Refer users to git-rev-parse for revision specification syntax.

2007-01-17 20:45:41 -08:00

git-cherry.txt

git-cherry: document limit and add diagram

2006-10-26 18:53:18 -07:00

git-clean.txt

Teach git-clean optional <paths>... parameters.

2006-05-08 16:40:45 -07:00

git-clone.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-commit-tree.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-commit.txt

Documentation: --amend cannot be combined with -c/-C/-F.

2007-01-24 15:32:52 -08:00

git-convert-objects.txt

…

git-count-objects.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-cvsexportcommit.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-cvsimport.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-cvsserver.txt

git-cvsserver asciidoc formatting tweaks

2006-06-07 16:32:50 -07:00

git-daemon.txt

git-daemon documentation on enabling services.

2007-01-24 15:29:07 -08:00

git-describe.txt

Improve git-describe performance by reducing revision listing.

2007-01-14 21:17:27 -08:00

git-diff-files.txt

Assorted typo fixes

2006-07-09 02:42:41 -07:00

git-diff-index.txt

Minor grammar fixes for git-diff-index.txt

2006-11-02 18:03:31 -08:00

git-diff-stages.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-diff-tree.txt

Move --pretty options into Documentation/pretty-formats.txt

2006-11-22 16:06:32 -08:00

git-diff.txt

Refer users to git-rev-parse for revision specification syntax.

2007-01-17 20:45:41 -08:00

git-fetch-pack.txt

Update documentation of fetch-pack, push and send-pack

2007-01-19 17:54:32 -08:00

git-fetch.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-fmt-merge-msg.txt

…

git-for-each-ref.txt

Documentation: a few spelling fixes

2007-01-17 08:44:32 -08:00

git-format-patch.txt

Document --ignore-if-in-upstream in git-format-patch

2007-01-18 14:29:42 -08:00

git-fsck-objects.txt

Documentation: Spelling fixes

2006-06-03 23:54:55 -07:00

git-gc.txt

git-gc: do not run git-prune by default.

2007-01-21 23:28:28 -08:00

git-get-tar-commit-id.txt

Remove trailing dot after short description

2006-03-09 11:44:11 -08:00

git-grep.txt

Documentation: a few spelling fixes

2007-01-17 08:44:32 -08:00

git-hash-object.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-http-fetch.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-http-push.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-imap-send.txt

Several trivial documentation touch ups.

2006-05-05 14:21:18 -07:00

git-index-pack.txt

remove .keep pack lock files when done with refs update

2006-11-03 00:24:07 -08:00

git-init-db.txt

Document git-init

2007-01-11 12:58:10 -08:00

git-init.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-instaweb.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-local-fetch.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-log.txt

Refer users to git-rev-parse for revision specification syntax.

2007-01-17 20:45:41 -08:00

git-lost-found.txt

Remove trailing dot after short description

2006-03-09 11:44:11 -08:00

git-ls-files.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-ls-remote.txt

Documentation: a few spelling fixes

2007-01-17 08:44:32 -08:00

git-ls-tree.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-mailinfo.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-mailsplit.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-merge-base.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-merge-file.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-merge-index.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-merge-one-file.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-merge-tree.txt

Documentation: add a couple of missing docs.

2006-04-13 00:21:06 -07:00

git-merge.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-mktag.txt

…

git-mktree.txt

Documentation: add a couple of missing docs.

2006-04-13 00:21:06 -07:00

git-mv.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-name-rev.txt

typofix (git-name-rev documentation)

2006-07-11 12:45:20 -07:00

git-p4import.txt

use 'init' instead of 'init-db' for shipped docs and tools

2007-01-12 13:36:16 -08:00

git-pack-objects.txt

git-pack-objects progress flag documentation and cleanup

2006-11-07 16:05:37 -08:00

git-pack-redundant.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-pack-refs.txt

--prune is now default for 'pack-refs'

2007-01-08 14:46:00 -08:00

git-parse-remote.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-patch-id.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-peek-remote.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-prune-packed.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-prune.txt

Revert "prune: --grace=time"

2007-01-21 21:29:57 -08:00

git-pull.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-push.txt

rename --exec to --receive-pack for push and send-pack

2007-01-19 17:54:33 -08:00

git-quiltimport.txt

Implement a --dry-run option to git-quiltimport

2006-05-18 22:55:57 -07:00

git-read-tree.txt

read-tree: document --exclude-per-directory

2006-12-05 23:44:23 -08:00

git-rebase.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-receive-pack.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-reflog.txt

git reflog expire: document --stale-fix option.

2007-01-15 14:43:03 -08:00

git-relink.txt

Remove trailing dot after short description

2006-03-09 11:44:11 -08:00

git-remote.txt

Documentation: add git-remote man page

2007-01-08 21:42:37 -08:00

git-repack.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-repo-config.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-request-pull.txt

Remove trailing dot after short description

2006-03-09 11:44:11 -08:00

git-rerere.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-reset.txt

Documentation: merge-output is not too verbose now.

2007-01-14 21:31:30 -08:00

git-resolve.txt

Documentation/git-resolve: deprecated.

2007-01-17 13:00:23 -08:00

git-rev-list.txt

reflog inspection: introduce shortcut "-g"

2007-01-24 15:13:47 -08:00

git-rev-parse.txt

Document the master@{n} reflog query syntax.

2007-01-17 20:45:15 -08:00

git-revert.txt

Refer users to git-rev-parse for revision specification syntax.

2007-01-17 20:45:41 -08:00

git-rm.txt

git-rm documentation: remove broken behaviour from the example.

2007-01-16 11:50:29 -08:00

git-runstatus.txt

Document git-runstatus

2006-11-18 14:04:45 -08:00

git-send-email.txt

git-send-email: Read the default SMTP server from the GIT config file

2006-10-29 12:45:23 -08:00

git-send-pack.txt

rename --exec to --receive-pack for push and send-pack

2007-01-19 17:54:33 -08:00

git-sh-setup.txt

Documentation/git-sh-setup.txt: programmer's docs

2007-01-17 01:13:05 -08:00

git-shell.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-shortlog.txt

Documentation: a few spelling fixes

2007-01-17 08:44:32 -08:00

git-show-branch.txt

reflog inspection: introduce shortcut "-g"

2007-01-24 15:13:47 -08:00

git-show-index.txt

…

git-show-ref.txt

show-ref --hash=len, --abbrev=len, and --abbrev

2006-10-01 00:32:44 -07:00

git-show.txt

Refer users to git-rev-parse for revision specification syntax.

2007-01-17 20:45:41 -08:00

git-ssh-fetch.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-ssh-upload.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-status.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-stripspace.txt

Remove trailing dot after short description

2006-03-09 11:44:11 -08:00

git-svn.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-svnimport.txt

git-svnimport: support for incremental import

2007-01-06 22:47:58 -08:00

git-symbolic-ref.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-tag.txt

git-tag -d: allow deleting multiple tags at once.

2007-01-20 19:19:12 -08:00

git-tar-tree.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-tools.txt

Documentation/git-tools.txt: mention tig and refer to wiki

2007-01-17 01:09:41 -08:00

git-unpack-file.txt

…

git-unpack-objects.txt

unpack-objects -r: call it "recover".

2006-09-13 12:59:49 -07:00

git-update-index.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-update-ref.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-update-server-info.txt

Documentation: HTTP needs update-server-info.

2005-12-17 11:39:39 -08:00

git-upload-archive.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-upload-pack.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-var.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git-verify-pack.txt

Fix up docs where "--" isn't displayed correctly.

2006-05-05 14:21:52 -07:00

git-verify-tag.txt

Remove trailing dot after short description

2006-03-09 11:44:11 -08:00

git-whatchanged.txt

Documentation/git-whatchanged.txt: show -<n> instead of --max-count.

2007-01-17 01:11:56 -08:00

git-write-tree.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

git.txt

Documentation/git.txt: command re-classification

2007-01-19 17:53:39 -08:00

gitk.txt

Documentation: sync git.txt command list and manual page title

2007-01-18 15:53:37 -08:00

glossary.txt

Documentation: describe shallow repository

2007-01-17 10:53:31 -08:00

hooks.txt

use 'init' instead of 'init-db' for shipped docs and tools

2007-01-12 13:36:16 -08:00

howto-index.sh

…

i18n.txt

Documentation: i18n commit log message notes.

2006-12-30 02:36:08 -08:00

install-doc-quick.sh

Makefile: add quick-install-doc for installing pre-built manpages

2006-12-23 09:22:30 -08:00

install-webdoc.sh

Documentation/Makefile: create tarballs for the man pages and html files

2006-05-18 20:15:45 -07:00

Makefile

Documentation/git.txt: command re-classification

2007-01-19 17:53:39 -08:00

merge-options.txt

git-merge --squash

2006-06-24 01:11:19 -07:00

merge-strategies.txt

Documentation: recursive is the default strategy these days.

2005-12-08 14:04:33 -08:00

pretty-formats.txt

Move commit reencoding parameter parsing to revision.c

2006-12-30 15:58:32 -08:00

pull-fetch-param.txt

Documentation: remove master:origin example from pull-fetch-param.txt

2007-01-01 14:38:08 -08:00

repository-layout.txt

Documentation/glossary.txt: describe remotes/ tracking and packed-refs

2007-01-17 10:54:58 -08:00

sort_glossary.pl

Added definitions for a few words:

2006-05-03 22:31:50 -07:00

SubmittingPatches

Documentation/SubmittingPatches: Gnus tips

2007-01-17 01:07:27 -08:00

tutorial-2.txt

Documentation/tutorial-2: Fix interesting typo in an example.

2007-01-21 21:24:49 -08:00

tutorial.txt

tutorial: shorthand for remotes but show distributed nature of git

2007-01-16 16:23:58 -08:00

urls.txt

Fix formatting for urls section of fetch, pull, and push manpages

2006-12-31 18:40:17 -08:00