diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-13 15:36:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-13 15:36:31 -0700 |
| commit | a1204bd7c3021cbaf1f4f485eb11f2e5a72355b3 (patch) | |
| tree | 7de327ecd3b3b45ec185ef9639c6bec7f029e4f9 /builtin/cat-file.c | |
| parent | Reduce draft release notes to 1.7.12 (diff) | |
| parent | am: don't call mailinfo if $rebasing (diff) | |
| download | tgif-a1204bd7c3021cbaf1f4f485eb11f2e5a72355b3.tar.xz | |
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
Diffstat (limited to 'builtin/cat-file.c')
0 files changed, 0 insertions, 0 deletions