git-commit-vandalism

History

Avery Pennarun 8cc5b29065 git merge -X<option> Teach "-X <option>" command line argument to "git merge" that is passed to strategy implementations. "ours" and "theirs" autoresolution introduced by the previous commit can be asked to the recursive strategy. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2010-01-17 22:45:06 -08:00
..
builtin-fetch--tool.c	Merge branch 'jn/help-everywhere'	2009-11-20 23:44:52 -08:00
git-checkout.sh
git-clean.sh
git-clone.sh
git-commit.sh	Replace uses of "git-var" with "git var"	2008-07-30 11:42:01 -07:00
git-fetch.sh
git-gc.sh
git-ls-remote.sh
git-merge-ours.sh
git-merge.sh	git merge -X<option>	2010-01-17 22:45:06 -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
git-reset.sh
git-resolve.sh	Use 'fast-forward' all over the place	2009-10-24 23:50:28 -07:00
git-revert.sh
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.