git.ipfire.org Git - thirdparty/git.git/commit

]> git.ipfire.org Git - thirdparty/git.git/commit - git-merge-resolve.sh

projects / thirdparty / git.git / commit

author	Junio C Hamano <gitster@pobox.com>
	Tue, 3 Jul 2007 05:52:14 +0000 (22:52 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 3 Jul 2007 05:52:14 +0000 (22:52 -0700)
commit	5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3
tree	9f68d81a31f8dfe7af6096e7beac2dc0997c143a	tree \| snapshot
parent	36e5e70e0f40cf7ca4351b8159d68f8560a2805f	commit \| diff

Rewrite "git-frotz" to "git frotz"

This uses the remove-dashes target to replace "git-frotz" to "git frotz".

Signed-off-by: Junio C Hamano <gitster@pobox.com>

142 files changed:

Documentation/install-doc-quick.sh		diff \| blob \| blame \| history
contrib/examples/git-gc.sh		diff \| blob \| blame \| history
contrib/examples/git-resolve.sh		diff \| blob \| blame \| history
contrib/remotes2config.sh		diff \| blob \| blame \| history
git-am.sh		diff \| blob \| blame \| history
git-bisect.sh		diff \| blob \| blame \| history
git-checkout.sh		diff \| blob \| blame \| history
git-clean.sh		diff \| blob \| blame \| history
git-clone.sh		diff \| blob \| blame \| history
git-commit.sh		diff \| blob \| blame \| history
git-fetch.sh		diff \| blob \| blame \| history
git-filter-branch.sh		diff \| blob \| blame \| history
git-lost-found.sh		diff \| blob \| blame \| history
git-ls-remote.sh		diff \| blob \| blame \| history
git-merge-octopus.sh		diff \| blob \| blame \| history
git-merge-one-file.sh		diff \| blob \| blame \| history
git-merge-ours.sh		diff \| blob \| blame \| history
git-merge-resolve.sh		diff \| blob \| blame \| history
git-merge-stupid.sh		diff \| blob \| blame \| history
git-merge.sh		diff \| blob \| blame \| history
git-mergetool.sh		diff \| blob \| blame \| history
git-parse-remote.sh		diff \| blob \| blame \| history
git-pull.sh		diff \| blob \| blame \| history
git-quiltimport.sh		diff \| blob \| blame \| history
git-rebase.sh		diff \| blob \| blame \| history
git-repack.sh		diff \| blob \| blame \| history
git-request-pull.sh		diff \| blob \| blame \| history
git-reset.sh		diff \| blob \| blame \| history
git-sh-setup.sh		diff \| blob \| blame \| history
git-stash.sh		diff \| blob \| blame \| history
git-submodule.sh		diff \| blob \| blame \| history
git-tag.sh		diff \| blob \| blame \| history
git-verify-tag.sh		diff \| blob \| blame \| history
t/lib-read-tree-m-3way.sh		diff \| blob \| blame \| history
t/t0000-basic.sh		diff \| blob \| blame \| history
t/t0030-stripspace.sh		diff \| blob \| blame \| history
t/t1000-read-tree-m-3way.sh		diff \| blob \| blame \| history
t/t1001-read-tree-m-2way.sh		diff \| blob \| blame \| history
t/t1002-read-tree-m-u-2way.sh		diff \| blob \| blame \| history
t/t1003-read-tree-prefix.sh		diff \| blob \| blame \| history
t/t1004-read-tree-m-u-wf.sh		diff \| blob \| blame \| history
t/t1020-subdirectory.sh		diff \| blob \| blame \| history
t/t1100-commit-tree-options.sh		diff \| blob \| blame \| history
t/t1200-tutorial.sh		diff \| blob \| blame \| history
t/t1300-repo-config.sh		diff \| blob \| blame \| history
t/t1400-update-ref.sh		diff \| blob \| blame \| history
t/t2000-checkout-cache-clash.sh		diff \| blob \| blame \| history
t/t2001-checkout-cache-clash.sh		diff \| blob \| blame \| history
t/t2002-checkout-cache-u.sh		diff \| blob \| blame \| history
t/t2003-checkout-cache-mkdir.sh		diff \| blob \| blame \| history
t/t2004-checkout-cache-temp.sh		diff \| blob \| blame \| history
t/t2005-checkout-index-symlinks.sh		diff \| blob \| blame \| history
t/t2100-update-cache-badpath.sh		diff \| blob \| blame \| history
t/t2101-update-index-reupdate.sh		diff \| blob \| blame \| history
t/t2102-update-index-symlinks.sh		diff \| blob \| blame \| history
t/t2200-add-update.sh		diff \| blob \| blame \| history
t/t3000-ls-files-others.sh		diff \| blob \| blame \| history
t/t3001-ls-files-others-exclude.sh		diff \| blob \| blame \| history
t/t3002-ls-files-dashpath.sh		diff \| blob \| blame \| history
t/t3010-ls-files-killed-modified.sh		diff \| blob \| blame \| history
t/t3020-ls-files-error-unmatch.sh		diff \| blob \| blame \| history
t/t3100-ls-tree-restrict.sh		diff \| blob \| blame \| history
t/t3101-ls-tree-dirname.sh		diff \| blob \| blame \| history
t/t3200-branch.sh		diff \| blob \| blame \| history
t/t3210-pack-refs.sh		diff \| blob \| blame \| history
t/t3300-funny-names.sh		diff \| blob \| blame \| history
t/t3400-rebase.sh		diff \| blob \| blame \| history
t/t3401-rebase-partial.sh		diff \| blob \| blame \| history
t/t3403-rebase-skip.sh		diff \| blob \| blame \| history
t/t3500-cherry.sh		diff \| blob \| blame \| history
t/t3600-rm.sh		diff \| blob \| blame \| history
t/t3700-add.sh		diff \| blob \| blame \| history
t/t3800-mktag.sh		diff \| blob \| blame \| history
t/t3900-i18n-commit.sh		diff \| blob \| blame \| history
t/t3901-i18n-patch.sh		diff \| blob \| blame \| history
t/t4000-diff-format.sh		diff \| blob \| blame \| history
t/t4001-diff-rename.sh		diff \| blob \| blame \| history
t/t4002-diff-basic.sh		diff \| blob \| blame \| history
t/t4003-diff-rename-1.sh		diff \| blob \| blame \| history
t/t4004-diff-rename-symlink.sh		diff \| blob \| blame \| history
t/t4005-diff-rename-2.sh		diff \| blob \| blame \| history
t/t4006-diff-mode.sh		diff \| blob \| blame \| history
t/t4007-rename-3.sh		diff \| blob \| blame \| history
t/t4008-diff-break-rewrite.sh		diff \| blob \| blame \| history
t/t4009-diff-rename-4.sh		diff \| blob \| blame \| history
t/t4010-diff-pathspec.sh		diff \| blob \| blame \| history
t/t4011-diff-symlink.sh		diff \| blob \| blame \| history
t/t4012-diff-binary.sh		diff \| blob \| blame \| history
t/t4015-diff-whitespace.sh		diff \| blob \| blame \| history
t/t4100-apply-stat.sh		diff \| blob \| blame \| history
t/t4101-apply-nonl.sh		diff \| blob \| blame \| history
t/t4102-apply-rename.sh		diff \| blob \| blame \| history
t/t4103-apply-binary.sh		diff \| blob \| blame \| history
t/t4104-apply-boundary.sh		diff \| blob \| blame \| history
t/t4109-apply-multifrag.sh		diff \| blob \| blame \| history
t/t4110-apply-scan.sh		diff \| blob \| blame \| history
t/t4112-apply-renames.sh		diff \| blob \| blame \| history
t/t4113-apply-ending.sh		diff \| blob \| blame \| history
t/t4114-apply-typechange.sh		diff \| blob \| blame \| history
t/t4115-apply-symlink.sh		diff \| blob \| blame \| history
t/t4116-apply-reverse.sh		diff \| blob \| blame \| history
t/t4117-apply-reject.sh		diff \| blob \| blame \| history
t/t4118-apply-empty-context.sh		diff \| blob \| blame \| history
t/t4119-apply-config.sh		diff \| blob \| blame \| history
t/t4120-apply-popt.sh		diff \| blob \| blame \| history
t/t4121-apply-diffs.sh		diff \| blob \| blame \| history
t/t4200-rerere.sh		diff \| blob \| blame \| history
t/t4201-shortlog.sh		diff \| blob \| blame \| history
t/t5000-tar-tree.sh		diff \| blob \| blame \| history
t/t5100-mailinfo.sh		diff \| blob \| blame \| history
t/t5300-pack-object.sh		diff \| blob \| blame \| history
t/t5301-sliding-window.sh		diff \| blob \| blame \| history
t/t5302-pack-index.sh		diff \| blob \| blame \| history
t/t5400-send-pack.sh		diff \| blob \| blame \| history
t/t5401-update-hooks.sh		diff \| blob \| blame \| history
t/t5500-fetch-pack.sh		diff \| blob \| blame \| history
t/t6000lib.sh		diff \| blob \| blame \| history
t/t6002-rev-list-bisect.sh		diff \| blob \| blame \| history
t/t6003-rev-list-topo-order.sh		diff \| blob \| blame \| history
t/t6004-rev-list-path-optim.sh		diff \| blob \| blame \| history
t/t6005-rev-list-count.sh		diff \| blob \| blame \| history
t/t6006-rev-list-format.sh		diff \| blob \| blame \| history
t/t6010-merge-base.sh		diff \| blob \| blame \| history
t/t6023-merge-file.sh		diff \| blob \| blame \| history
t/t6024-recursive-merge.sh		diff \| blob \| blame \| history
t/t6025-merge-symlinks.sh		diff \| blob \| blame \| history
t/t6101-rev-parse-parents.sh		diff \| blob \| blame \| history
t/t6120-describe.sh		diff \| blob \| blame \| history
t/t7001-mv.sh		diff \| blob \| blame \| history
t/t7003-filter-branch.sh		diff \| blob \| blame \| history
t/t7004-tag.sh		diff \| blob \| blame \| history
t/t7101-reset.sh		diff \| blob \| blame \| history
t/t7300-clean.sh		diff \| blob \| blame \| history
t/t7400-submodule-basic.sh		diff \| blob \| blame \| history
t/t8001-annotate.sh		diff \| blob \| blame \| history
t/t8002-blame.sh		diff \| blob \| blame \| history
t/t9100-git-svn-basic.sh		diff \| blob \| blame \| history
t/t9104-git-svn-follow-parent.sh		diff \| blob \| blame \| history
t/t9107-git-svn-migrate.sh		diff \| blob \| blame \| history
t/t9110-git-svn-use-svm-props.sh		diff \| blob \| blame \| history
t/t9111-git-svn-use-svnsync-props.sh		diff \| blob \| blame \| history
t/t9300-fast-import.sh		diff \| blob \| blame \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom