git-commit-vandalism

History

Jonathan Nieder 6239af1c6c merge script: refuse to merge during merge Check MERGE_HEAD and bail out if it exists. Based on v1.6.3.3~3^2 (refuse to merge during a merge, 2009-06-01). Without this change, the scripted merge does not pass t3030. Cc: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2010-08-18 14:02:04 -07:00
..
builtin-fetch--tool.c	Merge branch 'jn/help-everywhere'	2009-11-20 23:44:52 -08:00
git-checkout.sh	Merge branch 'db/checkout'	2008-02-27 12:53:26 -08:00
git-clean.sh
git-clone.sh	Merge branch 'db/clone-in-c'	2008-05-25 13:41:37 -07:00
git-commit.sh	Replace uses of "git-var" with "git var"	2008-07-30 11:42:01 -07:00
git-fetch.sh	Honor "tagopt = --tags" configuration option	2010-04-19 16:34:49 -07:00
git-gc.sh
git-ls-remote.sh
git-merge-ours.sh
git-merge.sh	merge script: refuse to merge during merge	2010-08-18 14:02:04 -07:00
git-notes.sh	Builtin-ify git-notes	2010-02-13 19:36:13 -08:00
git-remote.perl	Typo "does not exists" when git remote update remote.	2008-10-16 08:20:15 -07:00
git-rerere.perl	Resurrect git-rerere to contrib/examples	2008-03-16 01:11:07 -07:00
git-reset.sh
git-resolve.sh	Use 'fast-forward' all over the place	2009-10-24 23:50:28 -07:00
git-revert.sh	contrib: resurrect scripted git-revert.	2007-12-26 17:38:00 -08:00
git-svnimport.perl	Convert git-* invocations to "git *" in the svnimport example.	2009-02-24 21:10:57 -08:00
git-svnimport.txt	Fix typo in contrib/examples/git-svnimport.txt	2009-02-25 08:33:14 -08:00
git-tag.sh	Replace uses of "git-var" with "git var"	2008-07-30 11:42:01 -07:00
git-verify-tag.sh
README	contrib/examples/README: give an explanation of the status of these files	2009-01-12 17:47:36 -08:00

README

These are original scripted implementations, kept primarily for their
reference value to any aspiring plumbing users who want to learn how
pieces can be fit together.