From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 Jul 2012 22:36:31 +0000 (-0700)
Subject: Merge branch 'mz/rebase-no-mbox'
X-Git-Tag: v1.7.12-rc0~44
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a1204bd7c3021cbaf1f4f485eb11f2e5a72355b3;p=git.git

Merge branch 'mz/rebase-no-mbox'

Teach "am --rebasing" codepath to grab authorship, log message and
the patch text directly out of existing commits.  This will help
rebasing commits that have confusing "diff" output in their log
messages.

* mz/rebase-no-mbox:
  am: don't call mailinfo if $rebasing
  am --rebasing: get patch body from commit, not from mailbox
  rebase --root: print usage on too many args
  rebase: don't source git-sh-setup twice
---

a1204bd7c3021cbaf1f4f485eb11f2e5a72355b3