| commit | a4f25e368247108e89e5ee1a02c2f1b6fc31c56f | |
| author | Stephen Haberman <stephen@exigencecorp.com> | |
| Wed, 15 Oct 2008 07:44:37 +0000 (15 02:44 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 Oct 2008 16:23:53 +0000 (16 09:23 -0700) | ||
| tree | 612800429f9193651eb9196426382881b73e25b3 | treesnapshot (tar.gz zip) |
| parent | bb645071645240a23ede4e93c9425252a0eaaefb | commitdiff |
rebase-i-p: fix 'no squashing merges' tripping up non-merges
Also only check out the first parent if this commit if not a squash--if it is a
squash, we want to explicitly ignore the parent and leave the wc as is, as
cherry-pick will apply the squash on top of it.
Signed-off-by: Stephen Haberman <stephen@exigencecorp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Also only check out the first parent if this commit if not a squash--if it is a
squash, we want to explicitly ignore the parent and leave the wc as is, as
cherry-pick will apply the squash on top of it.
Signed-off-by: Stephen Haberman <stephen@exigencecorp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory |