user/sven/git.git, branch v1.7.8.2

Git 1.7.8.2

2011-12-28T20:03:24Z

Contains accumulated fixes since 1.7.8 that have been merged to the 'master' branch in preparation for the 1.7.9 release. Signed-off-by: Junio C Hamano

Merge branch 'jv/maint-config-set' into maint

2011-12-28T20:03:19Z

* jv/maint-config-set: Fix an incorrect reference to --set-all.

Merge branch 'jk/follow-rename-score' into maint

2011-12-28T19:49:37Z

* jk/follow-rename-score: use custom rename score during --follow

Merge branch 'jc/checkout-m-twoway' into maint

2011-12-28T19:44:54Z

* jc/checkout-m-twoway: t/t2023-checkout-m.sh: fix use of test_must_fail checkout_merged(): squelch false warning from some gcc Test 'checkout -m -- path' checkout -m: no need to insist on having all 3 stages

Merge branch 'tr/doc-sh-setup' into maint

2011-12-28T19:42:51Z

* tr/doc-sh-setup: git-sh-setup: make require_clean_work_tree part of the interface

Merge branch 'jk/maint-strbuf-missing-init' into maint

2011-12-28T19:42:46Z

* jk/maint-strbuf-missing-init: commit, merge: initialize static strbuf

Merge branch 'jk/maint-push-v-is-verbose' into maint

2011-12-28T19:42:42Z

* jk/maint-push-v-is-verbose: make "git push -v" actually verbose

Merge branch 'jk/http-push-to-empty' into maint

2011-12-28T19:42:37Z

* jk/http-push-to-empty: remote-curl: don't pass back fake refs Conflicts: remote-curl.c

Merge branch 'jk/doc-fsck' into maint

2011-12-28T19:42:33Z

* jk/doc-fsck: docs: brush up obsolete bits of git-fsck manpage

Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint

2011-12-28T19:42:27Z

* jc/maint-lf-to-crlf-keep-crlf: lf_to_crlf_filter(): resurrect CRLF->CRLF hack