From: Junio C Hamano <junkio@cox.net>
Date: Thu, 10 Aug 2006 21:17:49 +0000 (-0700)
Subject: Merge branch 'master' into mk/rename
X-Git-Tag: v1.4.3-rc1~278^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44e1d764d0d3123a614377e10655b4348cf57771;p=git.git

Merge branch 'master' into mk/rename

* master:
  git-verify-pack: no need to count errors
  git-verify-pack: buffer overrun paranoia
  git-verify-pack: free pack after use and a cleanup
  git-verify-pack: get rid of while loop
  git-verify-pack: insist on .idx extension
  git-verify-pack: more careful path handling
  git-verify-pack: show usage when no pack was specified
  Add has_extension()
  builtin-apply: remove unused increment
  Fix git-diff A...B
  combine-diff: use color
  git-apply: applying a patch to make a symlink shorter.
  allow diff.renamelimit to be set regardless of -M/-C
  make --find-copies-harder imply -C
  find_unique_abbrev() with len=0 should not abbreviate
  check return value from diff_setup_done()
  Fix tutorial-2.html
  Documentation: git-status takes the same options as git-commit
  Update git-init-db(1) and documentation of core.sharedRepository
---

44e1d764d0d3123a614377e10655b4348cf57771