summaryrefslogtreecommitdiff
path: root/xdiff/xutils.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-12-04 16:30:00 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-12-04 16:30:00 -0800
commitba988a83f0cfdafdcfdc7ed44253840ea83578fb (patch)
treecee119a3eccf55b60a44fe29974fb108cd527739 /xdiff/xutils.c
parentgit-fetch: ignore dereferenced tags in expand_refs_wildcard (diff)
parentreceive-pack: do not insist on fast-forward outside refs/heads/ (diff)
downloadtgif-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 'xdiff/xutils.c')
0 files changed, 0 insertions, 0 deletions