| commit | a1204bd7c3021cbaf1f4f485eb11f2e5a72355b3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 Jul 2012 22:36:31 +0000 (13 15:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 Jul 2012 22:36:31 +0000 (13 15:36 -0700) | ||
| tree | 7de327ecd3b3b45ec185ef9639c6bec7f029e4f9 | treesnapshot (tar.gz zip) |
| parent | 2b533592900ecebeb69e2dd1b70744433700ff2d | commitdiff |
| parent | 0fbb95dc83c80fa12f731e703e88e61d9391abd5 | commitdiff |
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
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
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |
| git-rebase.sh | diff1 | diff2 | blobhistory |