From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Sep 2007 06:18:05 +0000 (-0700)
Subject: Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
X-Git-Tag: v1.5.3.2~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f3caeb9ac2ea13cf113183540f32fbc4c0468ed5;p=git.git

Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

* 'maint' of git://linux-nfs.org/~bfields/git:
  core-tutorial: minor cleanup
  documentation: replace Discussion section by link to user-manual chapter
  user-manual: todo updates and cleanup
  user-manual: fix introduction to packfiles
  user-manual: move packfile and dangling object discussion
  user-manual: rewrite object database discussion
  user-manual: reorder commit, blob, tree discussion
  user-manual: rewrite index discussion
  user-manual: create new "low-level git operations" chapter
  user-manual: rename "git internals" to "git concepts"
  user-manual: move object format details to hacking-git chapter
  user-manual: adjust section levels in "git internals"
---

f3caeb9ac2ea13cf113183540f32fbc4c0468ed5