From: Junio C Hamano <junkio@cox.net>
Date: Mon, 5 Mar 2007 01:24:49 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~98
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=784b11cd05e7862b0fbcc1251a65669c7004a8df;p=git.git

Merge branch 'maint'

* maint:
  GIT 1.5.0.3
  glossary: Add definitions for dangling and unreachable objects
  user-manual: more detailed merge discussion
  user-manual: how to replace commits older than most recent
  user-manual: insert earlier of mention content-addressable architecture
  user-manual: ensure generated manual references stylesheet
  user-manual: reset to ORIG_HEAD not HEAD to undo merge
  Documentation: mention module option to git-cvsimport
---

784b11cd05e7862b0fbcc1251a65669c7004a8df