GIT 0.99.9c

Contains the following changes since GIT 0.99.9b:

	Alex Riesen:
	      remove CR/LF from .gitignore

	Junio C Hamano:
	      Do not put automatic merge message after signed-off-by line.
	      git-clone: do not forget to create origin branch.
	      Make test-date buildable again.
	      Do not fail on hierarchical branch names.
	      Ignore '\r' at the end of line in $GIT_DIR/config
	      Be careful when dereferencing tags (credits Pasky).
	      Document --since and --until options to rev-parse.
	      Add --no-commit to git-merge/git-pull.
	      Add 'ours' merge strategy.
	      git-merge-ours: make sure our index matches HEAD
	      Illustration: "Fundamental Git Index Operations"
	      Illustration: "Git Diff Types"
	      Illustration: "Commit DAG Revision Naming"
	      GIT 0.99.9c

	Peter Eriksen:
	      Clean up the SunOS Makefile rule

1. 64da9e6 Add 'ours' merge strategy. by Junio C Hamano · 20 years ago
2. 123ee3c Add --no-commit to git-merge/git-pull. by Junio C Hamano · 20 years ago
3. 50b8e35 Documentation changes to recursive option for git-diff-tree by Chris Shoemaker · 20 years ago
4. 4f692b1 Allow git-merge not to commit. by Junio C Hamano · 20 years ago
5. 88f8f0a [PATCH] Enable and fix support for base less merges. by Fredrik Kuivinen · 20 years ago
6. f9d7241 Handle really trivial case inside git-merge. by Junio C Hamano · 20 years ago
7. bf7960e Use git-update-ref in scripts. by Junio C Hamano · 20 years ago
8. 60fa056 Fastpath the normal case by not checking that index matches HEAD. by Junio C Hamano · 20 years ago
9. deca7e8 Give default merge message after failed automerge. by Junio C Hamano · 20 years ago
10. a935824 Fix overzealous cleanliness check in git-merge by Junio C Hamano · 20 years ago
11. 8cc01e5 [PATCH] More descriptive messages for conflict cases in merges by Fredrik Kuivinen · 20 years ago
12. e4cf17c [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. by Fredrik Kuivinen · 20 years ago
13. f88ed17 Fix off-by-one error in git-merge by Junio C Hamano · 20 years ago
14. 720d150 Add a new merge strategy by Fredrik Kuivinen. by Junio C Hamano · 20 years ago
15. 2276aa6 Use Daniel's read-tree in the merge strategy 'resolve'. by Junio C Hamano · 20 years ago
16. 91063bb Multi-backend merge driver. by Junio C Hamano · 20 years ago