diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-17 00:10:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-17 00:10:28 (GMT) |
| commit | 88bbda08d7b9503862a8fb8846d78c67825e5e3d (patch) | |
| tree | 1eb8c68123ee29f1eb1ade9065041d8009ab95dc /git-rebase--interactive.sh | |
| parent | dd33927ccdb92205988ba98bb2bb7df47529cd6d (diff) | |
| parent | 473a189b92b70295157d20fe229d44824061c79f (diff) | |
| download | git-88bbda08d7b9503862a8fb8846d78c67825e5e3d.zip git-88bbda08d7b9503862a8fb8846d78c67825e5e3d.tar.gz git-88bbda08d7b9503862a8fb8846d78c67825e5e3d.tar.bz2 | |
Merge branch 'maint'
* maint:
Start preparing 1.5.6.4 release notes
git fetch-pack: do not complain about "no common commits" in an empty repo
rebase-i: keep old parents when preserving merges
t7600-merge: Use test_expect_failure to test option parsing
Fix buffer overflow in prepare_attr_stack
Fix buffer overflow in git diff
Fix buffer overflow in git-grep
git-cvsserver: fix call to nonexistant cleanupWorkDir()
Documentation/git-cherry-pick.txt et al.: Fix misleading -n description
Conflicts:
RelNotes
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index da79a24..e63a864 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -174,6 +174,8 @@ pick_one_preserving_merges () { new_parents="$new_parents $new_p" ;; esac + else + new_parents="$new_parents $p" fi done case $fast_forward in |