Petr Baudis bbd14cb011 [PATCH] git-merge-cache -q doesn't complain about failing merge program ...

git-merge-cache reporting failed merge program is undesirable for
Cogito, since it emits its own more appropriate error message in that
case. However, I want to show other possible git-merge-cache error
messages. So -q will just silence this particular error.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

2005-08-01 15:20:14 -07:00

..

cvs-migration.txt

CVS-like push-pull description update.

2005-08-01 12:47:30 -07:00

diff-format.txt

[PATCH] Miniscule correction of diff-format.txt

2005-06-08 13:09:01 -07:00

diff-options.txt

[PATCH] Clean up diff option descriptions.

2005-07-13 13:09:17 -07:00

diffcore.txt

[PATCH] Rework -B output.

2005-06-19 20:13:18 -07:00

git-apply-patch-script.txt

[PATCH 1/4] split core-git.txt and update

2005-05-10 14:55:22 -07:00

git-apply.txt

[PATCH] apply: match documentation, usage string and code.

2005-07-13 20:53:33 -07:00

git-cat-file.txt

[PATCH] git-cat-file: '-s' to find out object size.

2005-06-28 08:53:22 -07:00

git-check-files.txt

[PATCH 3/4] split core-git.txt and update

2005-05-10 15:01:23 -07:00

git-checkout-cache.txt

[PATCH] Implement git-checkout-cache -u to update stat information in the cache.

2005-05-19 09:50:57 -07:00

git-clone-pack.txt

[PATCH] Documentation: clone/fetch/upload.

2005-07-14 08:54:31 -07:00

git-clone-script.txt

[PATCH] clone-pack and clone-script: documentation and add a missing parameter.

2005-07-13 20:42:26 -07:00

git-commit-tree.txt

[PATCH] Update the list of diagnostics for git-commit-tree

2005-07-15 10:00:35 -07:00

git-convert-cache.txt

[PATCH 1/4] split core-git.txt and update

2005-05-10 14:55:22 -07:00

git-cvsimport-script.txt

[PATCH] git-cvsimport-script: add "import only" option

2005-07-11 10:26:07 -07:00

git-diff-cache.txt

[PATCH] Clean up diff option descriptions.

2005-07-13 13:09:17 -07:00

git-diff-files.txt

[PATCH] Clean up diff option descriptions.

2005-07-13 13:09:17 -07:00

git-diff-helper.txt

[PATCH] Update diff documentation.

2005-06-19 20:13:18 -07:00

git-diff-stages.txt

[PATCH] Clean up diff option descriptions.

2005-07-13 13:09:17 -07:00

git-diff-tree.txt

[PATCH] Clean up diff option descriptions.

2005-07-13 13:09:17 -07:00

git-export.txt

[PATCH 1/4] split core-git.txt and update

2005-05-10 14:55:22 -07:00

git-fetch-pack.txt

[PATCH] Documentation: clone/fetch/upload.

2005-07-14 08:54:31 -07:00

git-fetch-script.txt

[PATCH] Documentation: describe short-hand used in fetch/pull.

2005-07-16 09:23:06 -07:00

git-fsck-cache.txt

Document --strict flag to the fsck-cache command.

2005-07-27 18:57:14 -07:00

git-hash-object.txt

[PATCH] Expose object ID computation functions.

2005-07-08 17:07:37 -07:00

git-http-pull.txt

[PATCH] Remove "delta" object representation.

2005-06-27 15:27:51 -07:00

git-init-db.txt

[PATCH 3/4] split core-git.txt and update

2005-05-10 15:01:23 -07:00

git-local-pull.txt

[PATCH] Remove "delta" object representation.

2005-06-27 15:27:51 -07:00

git-ls-files.txt

Documentation and tests: ls-files exclude pattern.

2005-07-29 17:21:47 -07:00

git-ls-tree.txt

[PATCH] Rewrite ls-tree to behave more like "/bin/ls -a"

2005-05-29 11:40:40 -07:00

git-merge-base.txt

[PATCH 1/4] split core-git.txt and update

2005-05-10 14:55:22 -07:00

git-merge-cache.txt

[PATCH] git-merge-cache -q doesn't complain about failing merge program

2005-08-01 15:20:14 -07:00

git-merge-one-file-script.txt

[PATCH 1/4] split core-git.txt and update

2005-05-10 14:55:22 -07:00

git-mktag.txt

[PATCH 3/4] split core-git.txt and update

2005-05-10 15:01:23 -07:00

git-pack-objects.txt

[PATCH] Documentation: packed GIT support commands.

2005-07-14 08:54:31 -07:00

git-peek-remote.txt

[PATCH] Documentation: git-peek-remote.

2005-07-23 18:28:18 -07:00

git-prune-script.txt

[PATCH 1/4] split core-git.txt and update

2005-05-10 14:55:22 -07:00

git-pull-script.txt

[PATCH] Documentation: describe short-hand used in fetch/pull.

2005-07-16 09:23:06 -07:00

git-read-tree.txt

[PATCH] read-tree: update documentation for 3-way merge.

2005-06-07 15:13:24 -07:00

git-receive-pack.txt

[PATCH] Added hook in git-receive-pack

2005-07-31 23:30:59 -07:00

git-rename-script.txt

[PATCH] Add documentation for git-rename-script

2005-07-27 22:47:07 -07:00

git-resolve-script.txt

[PATCH 1/4] split core-git.txt and update

2005-05-10 14:55:22 -07:00

git-rev-list.txt

[PATCH] document git-rev-list better

2005-07-29 17:21:53 -07:00

git-rev-tree.txt

[PATCH 1/4] split core-git.txt and update

2005-05-10 14:55:22 -07:00

git-send-pack.txt

[PATCH] Documentation: send/receive.

2005-07-14 08:54:31 -07:00

git-show-index.txt

[PATCH] Documentation: packed GIT support commands.

2005-07-14 08:54:31 -07:00

git-ssh-pull.txt

[PATCH] Remove "delta" object representation.

2005-06-27 15:27:51 -07:00

git-ssh-push.txt

[PATCH] Remove "delta" object representation.

2005-06-27 15:27:51 -07:00

git-tag-script.txt

Update the documentation for git-tag-script to reflect current behavior.

2005-07-25 16:34:26 -07:00

git-tar-tree.txt

[PATCH] git-tar-tree: small doc update

2005-06-02 18:30:08 -07:00

git-unpack-file.txt

[PATCH 1/4] split core-git.txt and update

2005-05-10 14:55:22 -07:00

git-unpack-objects.txt

[PATCH] Fix a typo in git-unpack-objects documentation.

2005-07-22 17:48:45 -07:00

git-update-cache.txt

[PATCH] Add --info-only option to git-update-cache.

2005-07-08 17:07:37 -07:00

git-update-server-info.txt

[PATCH] Document update-server-info.

2005-07-23 18:28:19 -07:00

git-upload-pack.txt

[PATCH] Documentation: clone/fetch/upload.

2005-07-14 08:54:31 -07:00

git-var.txt

Fix up "make doc"

2005-07-15 14:57:09 -07:00

git-verify-pack.txt

[PATCH] Documentation: packed GIT support commands.

2005-07-14 08:54:31 -07:00

git-write-tree.txt

[PATCH] Trivial tidyups

2005-07-29 17:21:49 -07:00

git.txt

[PATCH] Document update-server-info.

2005-07-23 18:28:19 -07:00

Makefile

Fix up "make doc"

2005-07-15 14:57:09 -07:00

pack-protocol.txt

[PATCH] Document two pack push-pull protocols.

2005-07-13 20:42:26 -07:00

pull-fetch-param.txt

[PATCH] Documentation: describe short-hand used in fetch/pull.

2005-07-16 09:23:06 -07:00

tutorial.txt

[PATCH] Updates to tutorial.txt

2005-08-01 13:27:08 -07:00