projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix a bug in email extraction used in git-send-email.
[git.git]
/
git-rebase.sh
diff --git
a/git-rebase.sh
b/git-rebase.sh
index
6ff6088
..
e6b57b8
100755
(executable)
--- a/
git-rebase.sh
+++ b/
git-rebase.sh
@@
-152,6
+152,6
@@
then
exit 0
fi
-git-format-patch -k --stdout --full-index "$upstream"
ORIG_HEAD |
+git-format-patch -k --stdout --full-index "$upstream"
..
ORIG_HEAD |
git am --binary -3 -k --resolvemsg="$RESOLVEMSG"