summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Enrico Scholz <enrico.scholz@sigma-chemnitz.de>2012-11-22 16:58:54 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-11-26 09:34:28 -0800
commitf7d8e3d01f46ecfa5b4bc8c13640831d97a78236 (patch)
tree6f69ff022da38e3c27ebc719bf2a259a03f51637 /ll-merge.h
parentUpdate draft release notes to 1.8.1 (diff)
downloadtgif-f7d8e3d01f46ecfa5b4bc8c13640831d97a78236.tar.xz
emacs: make 'git-status' work with separate git dirs
when trying 'M-x git-status' in a submodule created with recent (1.7.5+) git, the command fails with | ... is not a git working tree This is caused by creating submodules with '--separate-git-dir' but still checking for a working tree by testing for a '.git' directory. The patch fixes this by relaxing the existing detection a little bit. Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Acked-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions