diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-18 11:49:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-18 11:49:11 -0700 |
| commit | 288aa7534ae79eef03f79aaec355a7eedb08ddfa (patch) | |
| tree | 5316efce15cad491893eb91fbb87cecb767f0f17 /git-rebase--am.sh | |
| parent | 54a3c67375384a38eae946b7996d226dbd9c26d4 (diff) | |
| parent | 0597ffa5ecff1b83f384357ab88afaf21838caa2 (diff) | |
| download | git-288aa7534ae79eef03f79aaec355a7eedb08ddfa.tar.gz | |
Merge branch 'fc/send-email-annotate'
Allows format-patch --cover-letter to be configurable; the most
notable is the "auto" mode to create cover-letter only for multi
patch series.
* fc/send-email-annotate:
rebase-am: explicitly disable cover-letter
format-patch: trivial cleanups
format-patch: add format.coverLetter configuration variable
log: update to OPT_BOOL
format-patch: refactor branch name calculation
format-patch: improve head calculation for cover-letter
send-email: make annotate configurable
Diffstat (limited to 'git-rebase--am.sh')
| -rw-r--r-- | git-rebase--am.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 97f31dc7af..f84854f09a 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -31,8 +31,8 @@ else rm -f "$GIT_DIR/rebased-patches" git format-patch -k --stdout --full-index --ignore-if-in-upstream \ - --src-prefix=a/ --dst-prefix=b/ \ - --no-renames $root_flag "$revisions" >"$GIT_DIR/rebased-patches" + --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \ + $root_flag "$revisions" >"$GIT_DIR/rebased-patches" ret=$? if test 0 != $ret |