git, branch v2.3.8

Git 2.3.8

2015-05-11T21:36:31Z

Signed-off-by: Junio C Hamano

Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3

2015-05-11T21:34:01Z

Documentation fix. * mm/usage-log-l-can-take-regex: log -L: improve error message on malformed argument Documentation: change -L: to -L:

Merge branch 'jc/diff-no-index-d-f' into maint-2.3

2015-05-11T21:34:00Z

The usual "git diff" when seeing a file turning into a directory showed a patchset to remove the file and create all files in the directory, but "git diff --no-index" simply refused to work. Also, when asked to compare a file and a directory, imitate POSIX "diff" and compare the file with the file with the same name in the directory, instead of refusing to run. * jc/diff-no-index-d-f: diff-no-index: align D/F handling with that of normal Git diff-no-index: DWIM "diff D F" into "diff D/F F"

Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3

2015-05-11T21:33:59Z

The default $HOME/.gitconfig file created upon "git config --global" that edits it had incorrectly spelled user.name and user.email entries in it. * oh/fix-config-default-user-name-section: config: fix settings in default_user_config template

Merge branch 'jc/epochtime-wo-tz' into maint-2.3

2015-05-11T21:33:58Z

"git commit --date=now" or anything that relies on approxidate lost the daylight-saving-time offset. * jc/epochtime-wo-tz: parse_date_basic(): let the system handle DST conversion parse_date_basic(): return early when given a bogus timestamp

Git 2.3.7

2015-04-27T19:25:36Z

Signed-off-by: Junio C Hamano

Merge branch 'tb/connect-ipv6-parse-fix' into maint

2015-04-27T19:23:54Z

An earlier update to the parser that disects a URL broke an address, followed by a colon, followed by an empty string (instead of the port number), e.g. ssh://example.com:/path/to/repo. * tb/connect-ipv6-parse-fix: connect.c: ignore extra colon after hostname

Merge branch 'ma/bash-completion-leaking-x' into maint

2015-04-27T19:23:51Z

The completion script (in contrib/) contaminated global namespace and clobbered on a shell variable $x. * ma/bash-completion-leaking-x: completion: fix global bash variable leak on __gitcompappend

Merge branch 'jc/push-cert' into maint

2015-04-27T19:23:50Z

The "git push --signed" protocol extension did not limit what the "nonce" that is a server-chosen string can contain or how long it can be, which was unnecessarily lax. Limit both the length and the alphabet to a reasonably small space that can still have enough entropy. * jc/push-cert: push --signed: tighten what the receiving end can ask to sign

Git 2.3.6

2015-04-21T19:17:09Z

Signed-off-by: Junio C Hamano