delta/git.git, branch mk/diff-delta-avoid-large-offset

diff-delta: do not allow delta offset truncation

2017-08-11T22:25:40+00:00

Prevent generating delta offsets beyond 4G, as the xdelta used in
the pack format cannot represent such large offset.

Signed-off-by: Martin Koegler 
Signed-off-by: Junio C Hamano

Merge tag 'v2.14.1'

2017-08-04T19:45:17+00:00

Start post 2.14 cycle

2017-08-04T19:44:55+00:00

Signed-off-by: Junio C Hamano

Git 2.14.1

2017-08-04T19:41:54+00:00

Signed-off-by: Junio C Hamano

Merge tag 'v2.13.5' into maint

2017-08-04T19:40:37+00:00

Git 2.14

2017-08-04T16:31:12+00:00

Signed-off-by: Junio C Hamano

Merge branch 'ah/patch-id-doc'

2017-08-04T16:29:15+00:00

Docfix.

* ah/patch-id-doc:
  doc: remove unsupported parameter from patch-id

Merge branch 'as/diff-options-grammofix'

2017-08-04T16:29:14+00:00

A grammofix.

* as/diff-options-grammofix:
  diff-options doc: grammar fix

Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po

2017-08-02T17:52:33+00:00

l10n for Git 2.14.0 round 2

* tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po:
  l10n: zh_CN: review for git v2.14.0 l10n
  l10n: ko.po: Update Korean translation
  l10n: zh_CN: for git v2.14.0 l10n round 2
  l10n: de.po: various fixes in German translation
  l10n: ru.po: update Russian translation
  l10n: fr.po v2.14.0 rnd 2
  l10n: fr.po Fix some french typos
  l10n: fr.po Fix typo
  l10n: fr.po Fix some translations
  l10n: de.po: update German translation
  l10n: vi.po (3213t): Updated 9 new strings
  l10n: Update Catalan translation
  l10n: bg.po: Updated Bulgarian translation (3213t)

l10n: zh_CN: review for git v2.14.0 l10n

2017-08-02T00:02:37+00:00

Reviewed-by: 依云 
Signed-off-by: Jiang Xin