git/examples at 09f53b16bc65e14b116a275b3c569b2aa8040ad8 - git

Tree: 09f53b16bc

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>		15 years ago
..
README	…
builtin-fetch--tool.c	Merge branch 'jn/help-everywhere'	15 years ago
git-checkout.sh	…
git-clean.sh	…
git-clone.sh	…
git-commit.sh	…
git-fetch.sh	…
git-gc.sh	…
git-ls-remote.sh	…
git-merge-ours.sh	…
git-merge.sh	git merge -X<option>	15 years ago
git-remote.perl	…
git-rerere.perl	…
git-reset.sh	…
git-resolve.sh	Use 'fast-forward' all over the place	15 years ago
git-revert.sh	…
git-svnimport.perl	…
git-svnimport.txt	…
git-tag.sh	…
git-verify-tag.sh	…

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.