delta/git.git/Documentation, branch pb/commit-editmsg-path

Git 2.9-rc2

2016-06-06T21:34:52+00:00

Signed-off-by: Junio C Hamano

Sync with 2.8.4

2016-06-06T21:30:49+00:00

* maint:
  Git 2.8.4

Git 2.8.4

2016-06-06T21:29:32+00:00

Signed-off-by: Junio C Hamano

Merge branch 'tb/core-eol-fix' into maint

2016-06-06T21:27:36+00:00

A couple of bugs around core.autocrlf have been fixed.

* tb/core-eol-fix:
  convert.c: ident + core.autocrlf didn't work
  t0027: test cases for combined attributes
  convert: allow core.autocrlf=input and core.eol=crlf
  t0027: make commit_chk_wrnNNO() reliable

Almost ready for 2.9-rc2

2016-06-03T21:38:35+00:00

Signed-off-by: Junio C Hamano

Merge branch 'em/man-bold-literal'

2016-06-03T21:38:02+00:00

The manpage output of our documentation did not render well in
terminal; typeset literals in bold by default to make them stand
out more.

* em/man-bold-literal:
  Documentation: bold literals in man

Merge branch 'pa/cherry-pick-doc-typo'

2016-06-03T21:38:02+00:00

"git cherry-pick --help" had three instances of word "behavior",
one of which was spelled "behaviour", which is updated to match the
other two.

* pa/cherry-pick-doc-typo:
  git-cherry-pick.txt: correct a small typo

Merge branch 'mr/send-email-doc-gmail-2fa'

2016-06-03T21:38:01+00:00

Typofix.

* mr/send-email-doc-gmail-2fa:
  Documentation/git-send-email: fix typo in gmail 2FA section

Documentation/git-send-email: fix typo in gmail 2FA section

2016-06-02T00:23:38+00:00

Signed-off-by: SZEDER Gábor 
Signed-off-by: Junio C Hamano

Git 2.9-rc1

2016-05-31T21:12:15+00:00

Signed-off-by: Junio C Hamano