merge-recursive: adjust to loosened "working file clobbered" check
[gitweb.git] / compat / inet_pton.c
2006-10-25 Merge branch 'aw/cvsimport'
2006-10-25 Merge for-each-ref to sync gitweb fully with 'next'
2006-10-23 Merge branch 'np/pack'
2006-10-17 Merge branch 'maint'
2006-10-02 Merge branch 'maint'
2006-10-01 Merge branch 'maint'
2006-10-01 Merge branch 'jc/gitpm'
2006-10-01 Merge branch 'jc/diff-stat'
2006-10-01 Merge branch 'lt/web'
2006-09-28 Merge branch 'jl/virtual'
2006-09-28 Cleaned up git-daemon virtual hosting support.