mirror of
https://github.com/git/git.git
synced 2024-09-30 06:42:15 +02:00
f5d3a6f575
Some git-merge-* commands are not merge strategies. This is based on v1.6.1-rc1~294^2~7 (builtin-merge: allow using a custom strategy, 2008-07-30) but it is less smart: we just use a hard-coded list of forbidden strategy names. It is okay if this falls out of date, since the code is just an example. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> |
||
|---|---|---|
| .. | ||
| builtin-fetch--tool.c | ||
| 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-notes.sh | ||
| git-remote.perl | ||
| git-rerere.perl | ||
| git-reset.sh | ||
| git-resolve.sh | ||
| 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.