diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-21 03:16:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-21 03:16:51 -0700 |
| commit | 292f4128b8e50d846489ca978e08f00d4917d30e (patch) | |
| tree | 064019d66d14d529e972f7ccf09345e019373d3a | |
| parent | f6ef6b852370da51bbd3d033c9d7e1bf62cac345 (diff) | |
| parent | efbff23609654ac0542d3421d19eea8dbc1f80cd (diff) | |
| download | git-292f4128b8e50d846489ca978e08f00d4917d30e.tar.gz git-292f4128b8e50d846489ca978e08f00d4917d30e.tar.xz | |
Merge branch 'js/fmt-patch' into next
* js/fmt-patch:
git-rebase: use canonical A..B syntax to format-patch
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 6ff6088d1..e6b57b8ab 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" |