git/t, branch v1.8.2.2

Merge branch 'jk/chopped-ident' into maint

2013-04-26T18:11:51Z

* jk/chopped-ident: blame: handle broken commit headers gracefully pretty: handle broken commit headers gracefully cat-file: print tags raw for "cat-file -p"

Merge branch 'rt/commentchar-fmt-merge-msg' into maint

2013-04-26T18:10:47Z

* rt/commentchar-fmt-merge-msg: t6200: avoid path mangling issue on Windows fmt-merge-msg: use core.commentchar in tag signatures completely fmt-merge-msg: respect core.commentchar in people credits

Merge branch 'rs/empty-archive' into maint

2013-04-26T18:03:31Z

* rs/empty-archive: t5004: fix issue with empty archive test and bsdtar

Merge branch 'pe/pull-rebase-v-q' into maint

2013-04-26T18:00:14Z

* pe/pull-rebase-v-q: pull: Apply -q and -v options to rebase mode as well

t7409: do not use export X=Y

2013-04-26T16:54:31Z

The shell syntax "export X=Y A=B" is not understood by all shells. Signed-off-by: Torsten Bögershausen Signed-off-by: Junio C Hamano

t9501: do not use export X=Y

2013-04-26T16:52:41Z

The shell syntax "export X=Y" is not understood by all shells. Signed-off-by: Torsten Bögershausen Signed-off-by: Junio C Hamano

t9020: do not use export X=Y

2013-04-26T16:52:11Z

The shell syntax "export X=Y" is not understood by all shells. Signed-off-by: Torsten Bögershausen Signed-off-by: Junio C Hamano

Merge branch 'sr/log-SG-no-textconv' into maint

2013-04-24T23:15:44Z

"git log -S/-G" started paying attention to textconv filter, but there was no way to disable this. Make it honor --no-textconv option. * sr/log-SG-no-textconv: diffcore-pickaxe: unify code for log -S/-G diffcore-pickaxe: fix leaks in "log -S" and "log -G" diffcore-pickaxe: port optimization from has_changes() to diff_grep() diffcore-pickaxe: respect --no-textconv diffcore-pickaxe: remove fill_one() diffcore-pickaxe: remove unnecessary call to get_textconv()

Merge branch 'jc/merge-tag-object' into maint

2013-04-24T23:14:06Z

"git merge $(git rev-parse v1.8.2)" behaved quite differently from "git merge v1.8.2", as if v1.8.2 were written as v1.8.2^0 and did not pay much attention to the annotated tag payload. Make the code notice the type of the tag object, in addition to the dwim_ref() based classification the current code uses (i.e. the name appears in refs/tags/) to decide when to special case merging of tags. * jc/merge-tag-object: t6200: test message for merging of an annotated tag t6200: use test_config/test_unconfig merge: a random object may not necssarily be a commit

Merge branch 'jk/doc-http-backend' into maint

2013-04-22T18:26:58Z

Improve documentation to illustrate "push authenticated, fetch anonymous" configuration for smart HTTP servers. * jk/doc-http-backend: doc/http-backend: match query-string in apache half-auth example doc/http-backend: give some lighttpd config examples doc/http-backend: clarify "half-auth" repo configuration