summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-19 19:33:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-19 19:33:58 (GMT)
commitbdae4af87053490adad2dc9fb184d6d050d46a4c (patch)
tree8a4b08e3d8df982b9e54d67b34be12b530fd56bd /setup.c
parent8d7fefaac4318ac3155368f475e10f97714ebd47 (diff)
parent176b2d328ccc305aa2e565c39ad7b0fb24099275 (diff)
downloadgit-bdae4af87053490adad2dc9fb184d6d050d46a4c.zip
git-bdae4af87053490adad2dc9fb184d6d050d46a4c.tar.gz
git-bdae4af87053490adad2dc9fb184d6d050d46a4c.tar.bz2
Merge branch 'sg/setup-doc-update'
Comment update. * sg/setup-doc-update: setup.c: fix comment about order of .git directory discovery
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.c b/setup.c
index 50c6b2a..8cc3418 100644
--- a/setup.c
+++ b/setup.c
@@ -926,7 +926,7 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
* - ../.git
* - ../.git/
* - ../ (bare)
- * - ../../.git/
+ * - ../../.git
* etc.
*/
one_filesystem = !git_env_bool("GIT_DISCOVERY_ACROSS_FILESYSTEM", 0);