From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Feb 2017 18:48:10 +0000 (-0800)
Subject: Merge branch 'bc/worktree-doc-fix-detached'
X-Git-Tag: v2.12.0~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc9ded480245c1014b526c4b951d1acb3a60d3fa;p=git

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

Doc update.

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

dc9ded480245c1014b526c4b951d1acb3a60d3fa
diff --cc Documentation/git-worktree.txt
index e257c19ebe,190e269515..553cf8413f
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@@ -49,10 -49,9 +49,10 @@@ add <path> [<branch>]:
  
  Create `<path>` and checkout `<branch>` into it. The new working directory
  is linked to the current repository, sharing everything except working
 -directory specific files such as HEAD, index, etc.
 +directory specific files such as HEAD, index, etc. `-` may also be
 +specified as `<branch>`; it is synonymous with `@{-1}`.
  +
- If `<branch>` is omitted and neither `-b` nor `-B` nor `--detached` used,
+ If `<branch>` is omitted and neither `-b` nor `-B` nor `--detach` used,
  then, as a convenience, a new branch based at HEAD is created automatically,
  as if `-b $(basename <path>)` was specified.