diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-14 22:04:43 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-14 22:04:43 +0100 |
| commit | 9a26dbd120110ad4e07d3047abc13d615183c8ec (patch) | |
| tree | 6d17a27f3ba5417be85d6b072ab3bfd131c95738 /git-am.sh | |
| parent | rebase: do not get confused in fast-forward situation. (diff) | |
| parent | git-am support for naked email messages (take 2) (diff) | |
| download | git-9a26dbd120110ad4e07d3047abc13d615183c8ec.tar.xz git-9a26dbd120110ad4e07d3047abc13d615183c8ec.zip | |
Merge branch 'hold/am'
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -160,10 +160,7 @@ else # Start afresh. mkdir -p "$dotest" || exit - # cat does the right thing for us, including '-' to mean - # standard input. - cat "$@" | - git-mailsplit -d$prec "$dotest/" >"$dotest/last" || { + git-mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" || { rm -fr "$dotest" exit 1 } |