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 /git-rebase--merge.sh | |
| parent | 2b533592900ecebeb69e2dd1b70744433700ff2d (diff) | |
| parent | 0fbb95dc83c80fa12f731e703e88e61d9391abd5 (diff) | |
| download | git-a1204bd7c3021cbaf1f4f485eb11f2e5a72355b3.tar.gz | |
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 'git-rebase--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index dc599077f0..b10f2cf21b 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -3,8 +3,6 @@ # Copyright (c) 2010 Junio C Hamano. # -. git-sh-setup - prec=4 read_state () { |