delta/git.git/Documentation, branch ks/prepare-commit-msg-sample-fix

hook: add a simple first example

2017-07-12T20:21:07+00:00

Add a simple example that replaces an outdated example
that was removed. This ensures that there's at the least
a simple example that illustrates what could be done
using the hook just by enabling it.

Also, update the documentation.

Signed-off-by: Kaartic Sivaraam 
Signed-off-by: Junio C Hamano

hook: cleanup script

2017-07-12T20:20:40+00:00

Prepare the 'preare-commit-msg' sample script for
upcoming changes. Preparation includes removal of
an example that has outlived it's purpose. The example
is the one that comments the "Conflicts:" part of a
merge commit message. It isn't relevant anymore as
it's done by default since 261f315b ("merge & sequencer:
turn "Conflicts:" hint into a comment", 2014-08-28).

Further update the relevant comments from the sample script
and update the documentation.

Signed-off-by: Kaartic Sivaraam 
Signed-off-by: Junio C Hamano

Fifteenth batch for 2.14

2017-07-07T01:26:13+00:00

Signed-off-by: Junio C Hamano

Merge branch 'xz/send-email-batch-size'

2017-07-07T01:14:46+00:00

"git send-email" learned to overcome some SMTP server limitation
that does not allow many pieces of e-mails to be sent over a single
session.

* xz/send-email-batch-size:
  send-email: --batch-size to work around some SMTP server limit

Fourteenth batch for 2.14

2017-07-05T20:33:51+00:00

Signed-off-by: Junio C Hamano

send-email: --batch-size to work around some SMTP server limit

2017-07-05T16:09:45+00:00

Some email servers (e.g. smtp.163.com) limit the number emails to be
sent per session (connection) and this will lead to a faliure when
sending many messages.

Teach send-email to disconnect after sending a number of messages
(configurable via the --batch-size= option), wait for a few
seconds (configurable via the --relogin-delay= option) and
reconnect, to work around such a limit.

Also add two configuration variables to give these options the default.

Note:

  We will use this as a band-aid for now, but in the longer term, we
  should look at and react to the SMTP error code from the server;
  Xianqiang reports that 450 and 451 are returned by problematic
  servers.

  cf. https://public-inbox.org/git/7993e188.d18d.15c3560bcaf.Coremail.zxq_yx_007@163.com/

Signed-off-by: xiaoqiang zhao 
Signed-off-by: Junio C Hamano

Thirteenth batch for 2.14

2017-06-30T20:47:49+00:00

Signed-off-by: Junio C Hamano

Merge branch 'vs/typofixes'

2017-06-30T20:45:25+00:00

Many typofixes.

* vs/typofixes:
  Spelling fixes

Merge branch 'ah/doc-pretty-color-auto-prefix'

2017-06-30T20:45:23+00:00

Doc update.

* ah/doc-pretty-color-auto-prefix:
  doc: clarify syntax for %C(auto,...) in pretty formats

Merge branch 'ks/submodule-add-doc'

2017-06-30T20:45:22+00:00

Doc update.

* ks/submodule-add-doc:
  Documentation/git-submodule: cleanup "add" section