git/Documentation, branch v2.12.1

Git 2.12.1

2017-03-20T20:17:08Z

Signed-off-by: Junio C Hamano

Preparing for 2.12.1

2017-03-16T21:01:20Z

Signed-off-by: Junio C Hamano

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 '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

Documentation: use brackets for optional arguments

2017-02-22T18:22:15Z

The documentation for git blame used vertical bars for optional arguments to -M and -C, which is unusual and potentially confusing. Since most man pages use brackets for optional items, and that's consistent with how we document the same options for git diff and friends, use brackets here, too. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano