diff options
| author | Stephen Haberman <stephen@exigencecorp.com> | 2008-10-15 02:44:37 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-16 09:23:53 -0700 |
| commit | a4f25e368247108e89e5ee1a02c2f1b6fc31c56f (patch) | |
| tree | 612800429f9193651eb9196426382881b73e25b3 /t/.gitattributes | |
| parent | bb645071645240a23ede4e93c9425252a0eaaefb (diff) | |
| download | git-a4f25e368247108e89e5ee1a02c2f1b6fc31c56f.tar.gz git-a4f25e368247108e89e5ee1a02c2f1b6fc31c56f.tar.xz | |
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>
Diffstat (limited to 't/.gitattributes')
0 files changed, 0 insertions, 0 deletions