зеркало из https://github.com/microsoft/git.git
8cc5b29065
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> |
||
|---|---|---|
| .. | ||
| README | ||
| 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-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.