summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-21 10:16:38 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-21 10:16:38 (GMT)
commitefbff23609654ac0542d3421d19eea8dbc1f80cd (patch)
tree16465530ed9b898b1cdec1bac9b10617fc4beedd /git-rebase.sh
parent685637381a967cd7388495f97b12b7cf177abbb4 (diff)
downloadgit-efbff23609654ac0542d3421d19eea8dbc1f80cd.zip
git-efbff23609654ac0542d3421d19eea8dbc1f80cd.tar.gz
git-efbff23609654ac0542d3421d19eea8dbc1f80cd.tar.bz2
git-rebase: use canonical A..B syntax to format-patch
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 6ff6088..e6b57b8 100755
--- 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"