summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Patrick Steinhardt <ps@pks.im>2015-08-04 14:27:57 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-05 12:57:14 -0700
commit65f9b75dfe34a67cf4c6a8507f999c5710d36ba9 (patch)
treec404b18564ccf146290a6d4059f6cb37d0cf4346 /Documentation
parentDocumentation/config: mention "now" and "never" for 'expire' settings (diff)
downloadtgif-65f9b75dfe34a67cf4c6a8507f999c5710d36ba9.tar.xz
Documentation/git-worktree: fix duplicated 'from'
Signed-off-by: Patrick Steinhardt <ps@pks.im> Acked-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-worktree.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 400b313538..fb68156cf8 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -124,7 +124,7 @@ thumb is do not make any assumption about whether a path belongs to
$GIT_DIR or $GIT_COMMON_DIR when you need to directly access something
inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path.
-To prevent a $GIT_DIR/worktrees entry from from being pruned (which
+To prevent a $GIT_DIR/worktrees entry from being pruned (which
can be useful in some situations, such as when the
entry's working tree is stored on a portable device), add a file named
'locked' to the entry's directory. The file contains the reason in