diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-24 16:49:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-24 16:49:24 -0700 |
| commit | a5c8a98ca7e978c334e956df7ae2165c75c494da (patch) | |
| tree | df77e4b7b652a72f6bb862e81a55f95692eda55a /git-rebase.sh | |
| parent | Merge part of 'js/fmt-patch' for RFC2822 dates into 'sp/reflog' (diff) | |
| parent | fetch.c: remove an unused variable and dead code. (diff) | |
| download | tgif-a5c8a98ca7e978c334e956df7ae2165c75c494da.tar.xz | |
Merge branch 'master' into sp/reflog
* master: (90 commits)
fetch.c: remove an unused variable and dead code.
Clean up sha1 file writing
Builtin git-cat-file
builtin format-patch: squelch content-type for 7-bit ASCII
CMIT_FMT_EMAIL: Q-encode Subject: and display-name part of From: fields.
add more informative error messages to git-mktag
remove the artificial restriction tagsize < 8kb
git-rebase: use canonical A..B syntax to format-patch
git-format-patch: now built-in.
fmt-patch: Support --attach
fmt-patch: understand old <his> notation
Teach fmt-patch about --keep-subject
Teach fmt-patch about --numbered
fmt-patch: implement -o <dir>
fmt-patch: output file names to stdout
Teach fmt-patch to write individual files.
built-in tar-tree and remote tar-tree
Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree.
Builtin git-show-branch.
Builtin git-apply.
...
Diffstat (limited to 'git-rebase.sh')
| -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 6ff6088d18..e6b57b8ab9 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" |