Merge branch 'maint'

Junio C Hamano committed over 16 years ago

Merge branch 'jc/color-attrs' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'jk/maint-add-ignored-dir' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'bg/apply-fix-blank-at-eof' into maint

Junio C Hamano committed over 16 years ago

Teach rebase the --no-ff option.

Marc Branchaud committed over 16 years ago

http-backend: Don't infinite loop during die()

Shawn O. Pearce committed over 16 years ago

Correct references to /usr/bin/python which does not exist on FreeBSD

R. Tyler Ballance committed over 16 years ago

Make xmalloc and xrealloc thread-safe

Nicolas Pitre committed over 16 years ago

Documentation: explain the meaning of "-g" in git-describe output

Markus Heidelberg committed over 16 years ago

rev-list: use default abbrev length when abbrev-commit is in effect

Michael J Gruber committed over 16 years ago

imap-send: Remove limitation on message body

Ramkumar Ramachandra committed over 16 years ago

Sync with Git 1.7.0.3

Junio C Hamano committed over 16 years ago

Git 1.7.0.3

Junio C Hamano committed over 16 years ago

Merge branch 'maint-1.6.6' into maint

Junio C Hamano committed over 16 years ago

git checkout: create unparented branch by --orphan

Erick Mattos committed over 16 years ago

.mailmap: Map the the first submissions of MJG by e-mail

Michael J Gruber committed over 16 years ago

ls: remove redundant logic

Erik Faye-Lund committed over 16 years ago

cherry: support --abbrev option

Erik Faye-Lund committed over 16 years ago

Documentation/git-clone: Transform description list into item list

Michael J Gruber committed over 16 years ago

Documentation/urls: Remove spurious example markers

Michael J Gruber committed over 16 years ago