Package: git-core
Version: 1:1.6.3.1-1
Severity: important
Hello,
I had a history similar to this:
+--------+ +-------+ +-------+ +-------+ +-------+
+-------+
| master +------+ Xs... +---+ A +---+ Ys... +---+ B +---+
Zs... |
+--------+ +-------+ +-------+ +-------+ +-------+
+-------+
(This whole thing is a single branch)
I wanted to rebase it to master (that is, I did "rebase -i -p master
branch"), and, while doing it, squash commits A and B together. What I
didn't expect, though, is that after rebase, commits Ys disappeared
from a branch. After doing git lost-found, I discovered that the
history after the rebase was something like this:
+--------+ +-------+ +-------+ +-------+
| master +------+ Xs... +---+ A+B +---+ Zs... |
+--------+ +-------+ +-------+ +-------+
\--
\- +-------+
\+ Ys... |
+-------+
The Ys weren't on any branch.
Regards
Jiri Palecek
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.27-test-pcw (SMP w/1 CPU core; PREEMPT)
Locale: LANG=cs_CZ, LC_CTYPE=cs_CZ (charmap=ISO-8859-2)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-core depends on:
ii libc6 2.9-6 GNU C Library: Shared
libraries
ii libcurl3-gnutls 7.18.2-8.1 Multi-protocol file transfer
libra
ii libdigest-sha1-perl 2.11-2+b1 NIST SHA-1 message digest
algorith
ii liberror-perl 0.17-1 Perl module for
error/exception ha
ii libexpat1 1.95.8-3.4 XML parsing C library -
runtime li
ii perl-modules 5.10.0-19 Core Perl modules
ii zlib1g 1:1.2.3.3.dfsg-3 compression library - runtime
Versions of packages git-core recommends:
ii less 418-1 Pager program similar to more
ii openssh-client [ssh-client] 1:5.1p1-5 secure shell client, an
rlogin/rsh
ii patch 2.5.9-4 Apply a diff file to an
original
ii rsync 2.6.9-6 fast remote file copy program
(lik
Versions of packages git-core suggests:
pn git-arch <none> (no description available)
ii git-cvs 1:1.6.3.1-1 fast, scalable, distributed
revisi
pn git-daemon-run <none> (no description available)
pn git-doc <none> (no description available)
pn git-email <none> (no description available)
pn git-gui <none> (no description available)
ii git-svn 1:1.6.3.1-1 fast, scalable, distributed
revisi
pn gitk <none> (no description available)
pn gitweb <none> (no description available)
-- no debconf information
--
Using Opera's revolutionary e-mail client: http://www.opera.com/mail/
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
