Andrew's git / gitweb.git / diff
?
Merge branch 'sg/maint-gitdir-in-subdir' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 02:05:43 +0000 (18:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 02:05:43 +0000 (18:05 -0800)
* sg/maint-gitdir-in-subdir:
Fix gitdir detection when in subdir of gitdir

1  2 
setup.c patch | diff1 | diff2 | blob | history
t/t1501-worktree.sh patch | diff1 | diff2 | blob | history
diff --cc setup.c
Simple merge
diff --cc t/t1501-worktree.sh
Simple merge