diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-20 19:53:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-20 19:53:08 (GMT) |
| commit | 09c6a8e66cfe51400e6e7d5086266195c7ef62bf (patch) | |
| tree | ccef1948bd362902e625d5070384bfcb57ef2548 /git-rebase.sh | |
| parent | 1e627881465dbb47eeea85aa729dd4261216ff1b (diff) | |
| parent | 840b3ca758a42cb1481259521126ba2b02a5447a (diff) | |
| download | git-09c6a8e66cfe51400e6e7d5086266195c7ef62bf.zip git-09c6a8e66cfe51400e6e7d5086266195c7ef62bf.tar.gz git-09c6a8e66cfe51400e6e7d5086266195c7ef62bf.tar.bz2 | |
Merge branch 'jn/rebase-rename-am' into maint
* jn/rebase-rename-am:
rebase: protect against diff.renames configuration
t3400 (rebase): whitespace cleanup
Teach "apply --index-info" to handle rename patches
t4150 (am): futureproof against failing tests
t4150 (am): style fix
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 1d38afd..1b9ea48 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -544,7 +544,7 @@ fi if test -z "$do_merge" then git format-patch -k --stdout --full-index --ignore-if-in-upstream \ - $root_flag "$revisions" | + --no-renames $root_flag "$revisions" | git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" && move_to_original_branch ret=$? |