Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Feb 2010 05:54:10 +0000 (21:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Feb 2010 05:54:10 +0000 (21:54 -0800)
* maint:
blame: prevent a segv when -L given start > EOF
git-push: document all the status flags used in the output
Fix parsing of imap.preformattedHTML and imap.sslverify
git-add documentation: Fix shell quoting example

1  2 
Documentation/git-add.txt
Documentation/git-push.txt
imap-send.c
Simple merge
Simple merge
diff --cc imap-send.c
Simple merge