Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 4 May 2006 00:18:21 +0000 (17:18 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 4 May 2006 00:18:21 +0000 (17:18 -0700)
commite33b1dfe2834ceca1c449ec653dea636ca2d0200
treebfcef21ab182db7524419712a138d32deaf33fe8
parent73aeee68477b1c9afd40b654123928fa3f16580a
parent935e714204fe167aa6172a733e7131ee5b4577f4
Merge branch 'master' into next

* master:
  fix various typos in documentation
  blame: Fix path pruning
  cvsserver: use git-rev-list instead of git-log
  Fix "git-log --parents" breakage post v1.3.0
  add documentation for update-index --unresolve
log-tree.c
revision.c
update-index.c