From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 15 Jul 2008 06:45:49 +0000 (-0700)
Subject: Merge branch 'jc/rebase-orig-head'
X-Git-Tag: v1.6.0-rc0~67
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=633ce9a3ba973acf19a122e1359b7ae724887d70;hp=633ce9a3ba973acf19a122e1359b7ae724887d70;p=git.git

Merge branch 'jc/rebase-orig-head'

* jc/rebase-orig-head:
  Documentation: mention ORIG_HEAD in am, merge, and rebase
  Teach "am" and "rebase" to mark the original position with ORIG_HEAD
---