From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2007 09:21:43 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~436
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=acd69176f7ec54deac208e59ccfa079950ab7916;p=git.git

Merge branch 'maint'

* maint:
  git-apply: fix whitespace stripping
  apply --index-info: fall back to current index for mode changes
  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"
  revision walker: --cherry-pick is a limited operation
  git-sh-setup: typofix in comments
---

acd69176f7ec54deac208e59ccfa079950ab7916