git, branch v2.22.1

Git 2.22.1

2019-08-11T22:07:51Z

Signed-off-by: Junio C Hamano

.mailmap: update email address of Philip Oakley

2019-08-11T22:07:51Z

My IEE 'home for life' email service is being withdrawn on 30 Sept 2019. Replace with my new email domain. I also have a secondary (backup) 'home for life' through . Signed-off-by: Philip Oakley Signed-off-by: Philip Oakley Signed-off-by: Junio C Hamano

Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maint

2019-08-09T22:18:19Z

Compilation fix. * cb/xdiff-no-system-includes-in-dot-c: xdiff: remove duplicate headers from xpatience.c xdiff: remove duplicate headers from xhistogram.c xdiff: drop system includes in xutils.c

Merge branch 'jk/no-system-includes-in-dot-c' into maint

2019-08-09T22:18:19Z

Compilation fix. * jk/no-system-includes-in-dot-c: wt-status.h: drop stdio.h include verify-tag: drop signal.h include

Merge branch 'sg/fsck-config-in-doc' into maint

2019-08-09T22:18:18Z

Doc update. * sg/fsck-config-in-doc: Documentation/git-fsck.txt: include fsck.* config variables

Merge branch 'jk/xdiff-clamp-funcname-context-index' into maint

2019-08-09T22:18:18Z

The internal diff machinery can be made to read out of bounds while looking for --funcion-context line in a corner case, which has been corrected. * jk/xdiff-clamp-funcname-context-index: xdiff: clamp function context indices in post-image

RelNotes/2.21.1: typofix

2019-08-01T16:00:13Z

Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano

Merge fixes made on the 'master' front

2019-07-29T19:38:23Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/post-c89-rules-doc' into maint

2019-07-29T19:38:23Z

We have been trying out a few language features outside c89; the coding guidelines document did not talk about them and instead had a blanket ban against them. * jc/post-c89-rules-doc: CodingGuidelines: spell out post-C89 rules

Merge branch 'fc/fetch-with-import-fix' into maint

2019-07-29T19:38:23Z

Code restructuring during 2.20 period broke fetching tags via "import" based transports. * fc/fetch-with-import-fix: fetch: fix regression with transport helpers fetch: make the code more understandable fetch: trivial cleanup t5801 (remote-helpers): add test to fetch tags t5801 (remote-helpers): cleanup refspec stuff