Merge branch 'jc/rebase-orig-head'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2008 06:45:49 +0000 (23:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2008 06:45:49 +0000 (23:45 -0700)
commit633ce9a3ba973acf19a122e1359b7ae724887d70
treed360db37cc2c4f64ed85eae77e03f2b98061c9b1
parent055767194c15f9b7c39a509daf1a77472c77bed8
parent9869099bee332e4c351c3aaa15a74786d85909c7
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
Documentation/git-am.txt
git-am.sh
git-rebase--interactive.sh