summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6856373)
raw | patch | inline | side by side (parent: 6856373)
author | Junio C Hamano <junkio@cox.net> | |
Sun, 21 May 2006 10:16:38 +0000 (03:16 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sun, 21 May 2006 10:16:38 +0000 (03:16 -0700) |
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-rebase.sh | patch | blob | history |
diff --git a/git-rebase.sh b/git-rebase.sh
index 6ff6088d187cfc54e0de0898fab555e7af319961..e6b57b8ab9595be2875f328c0a8b0f2f58897793 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
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"