projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
delta micro optimization
[git.git]
/
git-am.sh
diff --git
a/git-am.sh
b/git-am.sh
index
731ab1f
..
ee6886f
100755
(executable)
--- a/
git-am.sh
+++ b/
git-am.sh
@@
-88,6
+88,7
@@
fall_back_3way () {
# saying that we reverted all those changes.
git-merge-resolve $orig_tree -- HEAD $his_tree || {
+ git-rerere
echo Failed to merge in the changes.
exit 1
}