Merge branch 'lt/reset-merge'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Dec 2008 09:21:45 +0000 (01:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Dec 2008 09:21:45 +0000 (01:21 -0800)
commitc32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf
treeffa6c4e6fd861ac3c77cbc5ff3f621f3e5f9c3f9
parent78d4096d573ae796f72e5b05bf1c332f038e54dd
parent1b5b465fbde9515e04bd1e8524a208c92af3555e
Merge branch 'lt/reset-merge'

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