git/examples at 1966d9f37b94fa506bfa43961fb111084aaa2c45 - git

Tree: 1966d9f37b

Junio C Hamano 2b916ffa18 Merge branch 'jn/update-contrib-example-merge' * jn/update-contrib-example-merge: (24 commits) merge script: learn --[no-]rerere-autoupdate merge script: notice @{-1} shorthand merge script: handle --no-ff --no-commit correctly merge script: --ff-only to disallow true merge merge script: handle many-way octopus merge script: handle -m --log correctly merge script: forbid merge -s index merge script: allow custom strategies merge script: merge -X<option> merge script: improve log message subject merge script: refuse to merge during merge merge script: tweak unmerged files message to match builtin merge script: --squash, --ff from unborn branch are errors fmt-merge-msg -m to override merge title merge-base --independent to print reduced parent list in a merge merge-base --octopus to mimic show-branch --merge-base Documentation: add a SEE ALSO section for merge-base t6200 (fmt-merge-msg): style nitpicks t6010 (merge-base): modernize style t7600 (merge): test merge from branch yet to be born ...		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	examples/commit: use --abbrev for commit summary	15 years ago
git-fetch.sh	Honor "tagopt = --tags" configuration option	15 years ago
git-gc.sh	…
git-ls-remote.sh	…
git-merge-ours.sh	…
git-merge.sh	merge script: learn --[no-]rerere-autoupdate	15 years ago
git-notes.sh	Builtin-ify git-notes	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	Eliminate “Finished cherry-pick/revert” message	15 years ago
git-svnimport.perl	Convert git-* invocations to "git *" in the svnimport example.	16 years ago
git-svnimport.txt	Fix typo in contrib/examples/git-svnimport.txt	16 years ago
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.