From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Dec 2008 09:21:45 +0000 (-0800)
Subject: Merge branch 'lt/reset-merge'
X-Git-Tag: v1.6.2-rc0~203
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf;p=git.git

Merge branch 'lt/reset-merge'

* lt/reset-merge:
  Document "git-reset --merge"
  Add 'merge' mode to 'git reset'
---

c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf