projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e526692
0cd29a0
)
Merge branch 'gb/am-foreign'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 6 Jul 2009 16:38:33 +0000
(09:38 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 6 Jul 2009 16:38:33 +0000
(09:38 -0700)
* gb/am-foreign:
git-am: refactor 'cleaning up and aborting'
git-am foreign patch support: StGIT support
git-am foreign patch support: autodetect some patch formats
git-am foreign patch support: introduce patch_format
1
2
git-am.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
git-am.sh
index 58d4eb6d2dc2eaa99ae0c70a414813cd0ce43e43,327807ddcb5fbe3d08c459887c472ed564210570..d64d9975358a6b9a18596c45b13434463903a344
---
1
/
git-am.sh
---
2
/
git-am.sh
+++ b/
git-am.sh
@@@
-281,12
-397,12
+404,12
@@@
els
done
shift
fi
- git mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" || {
-
rm -fr "$dotest
"
- exit 1
- }
+
+
check_patch_format "$@
"
+
+ split_patches "$@"
- # -s, -u, -k, --whitespace, -3, -C and -p flags are kept
+ # -s, -u, -k, --whitespace, -3, -C
, -q
and -p flags are kept
# for the resuming session after a patch failure.
# -i can and must be given when resuming.
echo " $git_apply_opt" >"$dotest/apply-opt"