Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation/git-worktree: fix duplicated 'from'
author
Patrick Steinhardt
<ps@pks.im>
Tue, 4 Aug 2015 12:27:57 +0000
(14:27 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 5 Aug 2015 19:57:14 +0000
(12:57 -0700)
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Acked-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-worktree.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
8cc8816
)
diff --git
a/Documentation/git-worktree.txt
b/Documentation/git-worktree.txt
index 400b313538ace788febdbb95c88da9ba550815c3..fb68156cf8ad0695eb6e5a7548c9a2e56be5c3f2 100644
(file)
--- 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.
$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
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