Merge branch 'maint-1.6.5' into maint-1.6.6

Junio C Hamano committed over 16 years ago

git diff --submodule: Show detailed dirty status of submodules

Jens Lehmann committed over 16 years ago

git-core: Support retrieving passwords with GIT_ASKPASS

Frank Li committed over 16 years ago

Documentation: fix a few typos in git-notes.txt

Michael J Gruber committed over 16 years ago

Remove extra '-' from git-am(1)

Michal Sojka committed over 16 years ago

t9119-git-svn-info.sh: test with svn 1.6.* as well

Michael J Gruber committed over 16 years ago

git-svn: req_svn when needed

Michael J Gruber committed over 16 years ago

run-command.c: fix build warnings on Ubuntu

Michael Wookey committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago

Merge branch 'jh/maint-submodule-status-in-void' (early part)

Junio C Hamano committed over 16 years ago

submodule summary: do not fail before the first commit

Junio C Hamano committed over 16 years ago

submodule summary: do not shift a non-existent positional variable

Jeff King committed over 16 years ago

Start preparing for 1.7.0.2

Junio C Hamano committed over 16 years ago

Merge branch 'tc/maint-transport-ls-remote-with-void' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'hm/maint-imap-send-crlf' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'sp/maint-push-sideband' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'jc/maint-fix-test-perm' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'np/fast-import-idx-v2' into maint

Junio C Hamano committed over 16 years ago

merge-file: add option to select union merge favor

Bert Wesarg committed over 16 years ago

merge-file: add option to specify the marker size

Bert Wesarg committed over 16 years ago