Merge branch 'maint-1.6.3' into maint

Junio C Hamano committed over 17 years ago

gitweb: parse_commit_text encoding fix

Zoltán Füzesi committed over 17 years ago

gitweb/README: Document $base_url

Jakub Narebski committed over 17 years ago

Documentation: git submodule: add missing options to synopsis

Jens Lehmann committed over 17 years ago

Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings

Junio C Hamano committed over 17 years ago

builtin-mailsplit.c: remove read_line_with_nul() since it is no longer used

Brandon Casey committed over 17 years ago

builtin-mailinfo,builtin-mailsplit: use strbufs

Brandon Casey committed over 17 years ago

strbuf: add new function strbuf_getwholeline()

Brandon Casey committed over 17 years ago

git apply: option to ignore whitespace differences

Giuseppe Bilotta committed over 17 years ago

Use an external program to implement fetching with curl

Daniel Barkalow committed over 17 years ago

Add support for external programs for handling native fetches

Daniel Barkalow committed over 17 years ago

git-merge-base/git-show-branch --merge-base: Documentation and test

Michael J Gruber committed over 17 years ago

git-merge-base/git-show-branch: Cleanup documentation and usage

Michael J Gruber committed over 17 years ago

t6010-merge-base.sh: Depict the octopus test graph

Michael J Gruber committed over 17 years ago

Better usage string for reflog.

Matthieu Moy committed over 17 years ago

diff-index: keep the original index intact

Junio C Hamano committed over 17 years ago

diff-index: report unmerged new entries

Junio C Hamano committed over 17 years ago

hg-to-git: don't import the unused popen2 module

Miklos Vajna committed over 17 years ago

send-email: remove debug trace

Erik Faye-Lund committed over 17 years ago

run-command.c: squelch a "use before assignment" warning

David Soria Parra committed over 17 years ago