git, branch v2.12.0

Git 2.12

2017-02-24T18:49:58Z

Signed-off-by: Junio C Hamano

Merge branch 'ps/doc-gc-aggressive-depth-update'

2017-02-24T18:48:10Z

Doc update. * ps/doc-gc-aggressive-depth-update: docs/git-gc: fix default value for `--aggressiveDepth`

Merge branch 'bc/worktree-doc-fix-detached'

2017-02-24T18:48:10Z

Doc update. * bc/worktree-doc-fix-detached: Documentation: correctly spell git worktree --detach

Merge branch 'dr/doc-check-ref-format-normalize'

2017-02-24T18:48:09Z

Doc update. * dr/doc-check-ref-format-normalize: git-check-ref-format: clarify documentation for --normalize

Merge branch 'gp/document-dotfiles-in-templates-are-not-copied'

2017-02-24T18:48:09Z

Doc update. * gp/document-dotfiles-in-templates-are-not-copied: init: document dotfiles exclusion on template copy

Merge branch 'rt/align-add-i-help-text'

2017-02-24T18:48:08Z

Doc update. * rt/align-add-i-help-text: git add -i: replace \t with blanks in the help message

Merge branch 'bc/blame-doc-fix'

2017-02-24T18:48:08Z

Doc update. * bc/blame-doc-fix: Documentation: use brackets for optional arguments

docs/git-gc: fix default value for `--aggressiveDepth`

2017-02-24T17:59:12Z

In commit 07e7dbf0d (gc: default aggressive depth to 50, 2016-08-11), the default aggressive depth of git-gc has been changed to 50. While git-config(1) has been updated to represent the new default value, git-gc(1) still mentions the old value. This patch fixes it. Signed-off-by: Patrick Steinhardt Reviewed-by: Jeff King Signed-off-by: Junio C Hamano

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

2017-02-24T17:55:41Z

l10n-2.12.0-rnd2 * tag 'l10n-2.12.0-rnd2' of git://github.com/git-l10n/git-po: (22 commits) l10n: zh_CN: for git v2.12.0 l10n round 2 l10n: Update Catalan translation l10n: pt_PT: update Portuguese tranlation l10n: sv.po: Update Swedish translation (3139t0f0u) l10n: de.po: translate 241 messages l10n: ko.po: Update Korean translation l10n: vi.po (3139t): Updated 2 new messages for rc1 l10n: fr.po: v2.12.0 round 2 3139t l10n: git.pot: v2.12.0 round 2 (2 new) l10n: vi.po: Updated Vietnamese translation (3137t) l10n: update Catalan translation l10n: sv.po: Update Swedish translation (3137t0f0u) l10n: fr.po: v2.11-rc0 first round l10n: ko.po: Update Korean translation l10n: fr.po: Fix a typo in the French translation l10n: fr.po: Remove gender specific adjectives l10n: fr.po: Fix typos l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed) l10n: bg: Updated Bulgarian translation (2913t+0f+0u) l10n: fixes to Catalan translation ...

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

2017-02-24T16:19:14Z

Translate 241 messages (3139t0f0u) for git v2.12.0-rc1. Signed-off-by: Jiang Xin