aboutsummaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-04 16:30:00 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-04 16:30:00 -0800
commitba988a83f0cfdafdcfdc7ed44253840ea83578fb (patch)
treecee119a3eccf55b60a44fe29974fb108cd527739 /wt-status.c
parent4cd75359ad5d4c90ba6ae6d68ffb6d00e5092b8a (diff)
parent562cefbdbfaeb92f91c961c67960a93a7772220c (diff)
downloadgit-ba988a83f0cfdafdcfdc7ed44253840ea83578fb.tar.gz
git-ba988a83f0cfdafdcfdc7ed44253840ea83578fb.tar.xz
Merge branch 'maint'
* maint: receive-pack: do not insist on fast-forward outside refs/heads/ git-mv: search more precisely for source directory in index Conflicts: receive-pack.c
Diffstat (limited to 'wt-status.c')
0 files changed, 0 insertions, 0 deletions