delta/git.git, branch sg/setup-doc-update

setup.c: fix comment about order of .git directory discovery

2017-12-07T16:09:06+00:00

Since gitfiles were introduced in b44ebb19e (Add platform-independent
.git "symlink", 2008-02-20) the order of checks during .git directory
discovery is: gitfile, gitdir, bare repo.  However, that commit did
only partially update the in-code comment describing this order,
missing the last line which still puts gitdir before gitfile.

Signed-off-by: SZEDER Gábor 
Signed-off-by: Junio C Hamano

Git 2.12.5

2017-09-22T05:47:41+00:00

Signed-off-by: Junio C Hamano

Sync with 2.11.4

2017-09-22T05:45:30+00:00

Signed-off-by: Junio C Hamano

Git 2.11.4

2017-09-22T05:44:45+00:00

Signed-off-by: Junio C Hamano

Sync with 2.10.5

2017-09-22T05:43:17+00:00

Signed-off-by: Junio C Hamano

Git 2.10.5

2017-09-22T05:42:22+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jk/safe-pipe-capture' into maint-2.10

2017-09-22T05:34:34+00:00

Merge branch 'jk/cvsimport-quoting' into maint-2.10

2017-09-22T05:34:34+00:00

Merge branch 'jc/cvsserver' into maint-2.10

2017-09-22T05:34:34+00:00

Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10

2017-09-22T05:34:34+00:00