git, branch v1.7.0.5

Git 1.7.0.5

2010-04-11T20:42:33Z

Signed-off-by: Junio C Hamano

Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maint

2010-04-11T20:39:47Z

* rc/maint-reflog-msg-for-forced-branch: branch: say "Reset to" in reflog entries for 'git branch -f' operations

blame documentation: -M/-C notice copied lines as well as moved ones

2010-04-11T19:17:42Z

Signed-off-by: Junio C Hamano

Let check_preimage() use memset() to initialize "struct checkout"

2010-04-10T05:42:57Z

Every code site except check_preimage() uses either memset() or declares a static instance of "struct checkout" to achieve proper initialization. Lets use memset() instead of explicit initialization of all members here too to be on the safe side in case this structure is expanded someday. Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano

Merge branch 'ef/maint-empty-commit-log' into maint

2010-04-10T05:38:53Z

* ef/maint-empty-commit-log: rev-list: fix --pretty=oneline with empty message

Merge branch 'jc/conflict-marker-size' into maint

2010-04-10T05:38:34Z

* jc/conflict-marker-size: diff --check: honor conflict-marker-size attribute

Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' into maint

2010-04-10T05:38:16Z

* sp/maint-http-backend-die-triggers-die-recursively: http-backend: Don't infinite loop during die()

Merge branch 'mg/maint-send-email-lazy-editor' into maint

2010-04-10T05:23:04Z

* mg/maint-send-email-lazy-editor: send-email: lazily assign editor variable

Merge branch 'rr/imap-send-unconfuse-from-line' into maint

2010-04-10T05:22:44Z

* rr/imap-send-unconfuse-from-line: imap-send: Remove limitation on message body

Merge branch 'rb/maint-python-path' into maint

2010-04-10T05:22:19Z

* rb/maint-python-path: Correct references to /usr/bin/python which does not exist on FreeBSD