object | 6ddc0964034342519a87fe013781abf31c6db6ad | commit |
author | Junio C Hamano <junkio@cox.net> | |
Fri, 4 Nov 2005 00:43:47 +0000 (16:43 -0800) |
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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQBDaq/XwMbZpPMRm5oRAiR+AJ9z6FAdb2buTHQqQ+VzqToTvGd0BwCfe9kX
9Jc+v4MIwEucxsuVtFVFntc=
=vt9s
-----END PGP SIGNATURE-----
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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQBDaq/XwMbZpPMRm5oRAiR+AJ9z6FAdb2buTHQqQ+VzqToTvGd0BwCfe9kX
9Jc+v4MIwEucxsuVtFVFntc=
=vt9s
-----END PGP SIGNATURE-----