delta/git.git, branch mg/format-ref-doc-fix

Documentation/git-for-each-ref: clarify peeling of tags for --format

2017-08-18T16:54:10+00:00

`*` in format strings means peeling of tag objects so that object field
names refer to the object that the tag object points at, instead of the
tag object itself.

Currently, this is documented using grammar that is clearly inspired by
classical latin, though missing more than an article in order to be
classical english.

Try and straighten that explanation out a bit.

Signed-off-by: Michael J Gruber 
Signed-off-by: Junio C Hamano

Documentation: use proper wording for ref format strings

2017-08-18T16:54:09+00:00

Various commands list refs and allow to use a format string for the
output that interpolates from the ref as well as the object it points
at (for-each-ref; branch and tag in list mode).

Currently, the documentation talks about interpolating from the object.
This is confusing because a ref points to an object but not vice versa,
so the object cannot possible know %(refname), for example. Thus, this is
wrong independent of refs being objects (one day, maybe) or not.

Change the wording to make this clearer (and distinguish it from formats
for the log family).

Signed-off-by: Michael J Gruber 
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

Git 2.13.5

2017-08-01T19:30:00+00:00

Signed-off-by: Junio C Hamano