From: Junio C Hamano <junkio@cox.net>
Date: Fri, 10 Feb 2006 06:19:21 +0000 (-0800)
Subject: Merge branch 'master'
X-Git-Tag: v1.3.0-rc1~54^2~88
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3acfbd7cf87b8a2d28dc8878d23c64994934d63e;p=git.git

Merge branch 'master'

* master:
  Merge branch 'jc/ls-files-o'
  count-delta.c: Match the delta data semantics change in version 3.
  remove delta-against-self bit
  stat() for existence in safe_create_leading_directories()
  call git_config() after setup_git_directory()
  Add --diff-filter= documentation paragraph
---

3acfbd7cf87b8a2d28dc8878d23c64994934d63e