delta/git.git, branch ad/pull-remote-doc github.com: git/git.git docs: fix formatting and grammar 2017-06-02T05:10:57+00:00 Adam Dinwoodie adam@dinwoodie.org 2017-06-01T10:37:03+00:00 0c79cee697f7f4e304c53108ee895b706df1322e When compiling the documentation, asciidoc thinks a backtick surrounded by whitespace shouldn't be interpreted as marking the start or end of a literal. In most cases, that's useful behaviour, but in the git-pull documentation it means asciidoc is failing to correctly detect which text should be monospaced and which shouldn't. To avoid this, remove the extraneous spaces from the text to be monospaced. It would also be possible to fix the formatting by switching to asciidoc's ++ monospace format markers and still have the space characters included in the monospace text, but the spaces aren't necessary and not having them keeps the markup simpler. Also include a minor grammar fix suggested by Jeff while we're changing these lines. Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
When compiling the documentation, asciidoc thinks a backtick surrounded
by whitespace shouldn't be interpreted as marking the start or end of a
literal.  In most cases, that's useful behaviour, but in the git-pull
documentation it means asciidoc is failing to correctly detect which
text should be monospaced and which shouldn't.

To avoid this, remove the extraneous spaces from the text to be
monospaced.  It would also be possible to fix the formatting by
switching to asciidoc's ++ monospace format markers and still have the
space characters included in the monospace text, but the spaces aren't
necessary and not having them keeps the markup simpler.

Also include a minor grammar fix suggested by Jeff while we're changing
these lines.

Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 2.13 2017-05-09T14:26:02+00:00 Junio C Hamano gitster@pobox.com 2017-05-09T14:26:02+00:00 b06d3643105c8758ed019125a4399cb7efdcce2c Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge tag 'l10n-2.13.0-rnd2.1' of git://github.com/git-l10n/git-po 2017-05-09T14:25:26+00:00 Junio C Hamano gitster@pobox.com 2017-05-09T14:25:26+00:00 951ea7656ebb3f30e6c5e941e625a1318ac58298 l10n for Git 2.13.0 round 2.1 * tag 'l10n-2.13.0-rnd2.1' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.13.0 l10n round 2 l10n: sv.po: Update Swedish translation (3195t0f0u) l10n: zh_CN: review for git v2.13.0 l10n round 1 l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (3195t) l10n: fr.po v2.13 rnd 2 l10n: de.po: translate 4 new messages l10n: de.po: update German translation l10n: de.po: lower case after semi-colon l10n: vi.po(3195t): Update translation for v2.13.0 round 2 l10n: git.pot: v2.13.0 round 2 (4 new, 7 removed) l10n: zh_CN: for git v2.13.0 l10n round 1 l10n: fr.po v2.13 round 1 l10n: pt_PT: update Portuguese translation l10n: bg.po: Updated Bulgarian translation (3201t) l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0 l10n: sv.po: Update Swedish translation (3199t0f0u) l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed) 
l10n for Git 2.13.0 round 2.1

* tag 'l10n-2.13.0-rnd2.1' of git://github.com/git-l10n/git-po:
  l10n: zh_CN: for git v2.13.0 l10n round 2
  l10n: sv.po: Update Swedish translation (3195t0f0u)
  l10n: zh_CN: review for git v2.13.0 l10n round 1
  l10n: Update Catalan translation
  l10n: bg.po: Updated Bulgarian translation (3195t)
  l10n: fr.po v2.13 rnd 2
  l10n: de.po: translate 4 new messages
  l10n: de.po: update German translation
  l10n: de.po: lower case after semi-colon
  l10n: vi.po(3195t): Update translation for v2.13.0 round 2
  l10n: git.pot: v2.13.0 round 2 (4 new, 7 removed)
  l10n: zh_CN: for git v2.13.0 l10n round 1
  l10n: fr.po v2.13 round 1
  l10n: pt_PT: update Portuguese translation
  l10n: bg.po: Updated Bulgarian translation (3201t)
  l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0
  l10n: sv.po: Update Swedish translation (3199t0f0u)
  l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)
Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 2017-05-09T14:12:34+00:00 Jiang Xin worldhello.net@gmail.com 2017-05-09T14:12:34+00:00 961f9c8b1b0f6bff09cb876f95e9ca33702763ac * 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (3195t0f0u) 
* 'master' of git://github.com/nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (3195t0f0u)
l10n: zh_CN: for git v2.13.0 l10n round 2 2017-05-09T13:55:38+00:00 Jiang Xin worldhello.net@gmail.com 2017-05-09T13:55:38+00:00 60638e9816d0aae40d4234d1a068f94fabc2fd4d Translate 4 messages (3195t0f0u) for git v2.13.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> 
Translate 4 messages (3195t0f0u) for git v2.13.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
l10n: sv.po: Update Swedish translation (3195t0f0u) 2017-05-09T07:05:09+00:00 Peter Krefting peter@softwolves.pp.se 2017-05-09T07:05:09+00:00 6402d7fcd5526b102b3e162630078de543d21901 Signed-off-by: Peter Krefting <peter@softwolves.pp.se> 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Sync with v2.12.3 2017-05-09T03:20:21+00:00 Junio C Hamano gitster@pobox.com 2017-05-09T03:20:21+00:00 09fc7aff1a3ebc20473993e558eba691180706ad Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jh/verify-index-checksum-only-in-fsck' 2017-05-09T03:17:42+00:00 Junio C Hamano gitster@pobox.com 2017-05-09T03:17:42+00:00 9b669787fc6ebc527df9ad058c4bcaf46bacc267 * jh/verify-index-checksum-only-in-fsck: t1450: avoid use of "sed" on the index, which is a binary file 
* jh/verify-index-checksum-only-in-fsck:
  t1450: avoid use of "sed" on the index, which is a binary file
l10n: zh_CN: review for git v2.13.0 l10n round 1 2017-05-08T23:03:34+00:00 Ray Chen oldsharp@gmail.com 2017-05-02T15:42:43+00:00 65e2041e4042c21d2b97d4ab194b881695493bb0 Signed-off-by: Ray Chen <oldsharp@gmail.com> 
Signed-off-by: Ray Chen <oldsharp@gmail.com>
Merge branch 'master' of https://github.com/vnwildman/git 2017-05-08T22:39:31+00:00 Jiang Xin worldhello.net@gmail.com 2017-05-08T22:39:31+00:00 0502887d3d37ea1d8ba1e35288a6652d3abff459 * 'master' of https://github.com/vnwildman/git: l10n: vi.po(3195t): Update translation for v2.13.0 round 2 
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po(3195t): Update translation for v2.13.0 round 2