delta/git.git, branch mf/no-dashed-subcommands

scripts: use "git foo" not "git-foo"

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

We want to make sure that people who copy & paste code would see
fewer instances of "git-foo".  The use of these dashed forms have
been discouraged since v1.6.0 days.

Signed-off-by: Michael Forney 
Signed-off-by: Junio C Hamano

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

Sync with v2.13.4

2017-08-01T18:46:59+00:00

Git 2.13.4

2017-08-01T18:45:17+00:00

Signed-off-by: Junio C Hamano

l10n: ko.po: Update Korean translation

2017-08-01T03:32:00+00:00

Signed-off-by: Changwoo Ryu

l10n: zh_CN: for git v2.14.0 l10n round 2

2017-08-01T01:26:19+00:00

Translate new l10n messages for git 2.14.0, and update translations on
"stash".

Signed-off-by: Jiang Xin