Public bug reported:
Binary package hint: git-core
I'm trying to slim down a repo with some ancient commits by doing an
interactive rebase from the first commit. I tried marking even just a
single commit (the second one in the list) as "fixup", but just got the
following output:
$ git rebase -i db35c57b45484d284abd21b1b4333d6e0b468f85
error: Untracked working tree file 'jEdit/jars/ErrorList.jar' would be
overwritten by merge.
shift: 1: can't shift that many
The file in question wasn't even tracked until a later commit, and I
don't really know what to do with the resulting intermediate stage.
`__git_ps1` returns "(master|REBASE-i)".
ProblemType: Bug
DistroRelease: Ubuntu 10.04
Package: git-core 1:1.7.0.4-1
ProcVersionSignature: Ubuntu 2.6.32-22.35-generic 2.6.32.11+drm33.2
Uname: Linux 2.6.32-22-generic i686
Architecture: i386
Date: Sat Jun 5 21:24:01 2010
InstallationMedia: Ubuntu-Netbook 10.04 "Lucid Lynx" - Release i386 (20100429.4)
ProcEnviron:
LANG=en_US.utf8
SHELL=/bin/bash
SourcePackage: git-core
** Affects: git-core (Ubuntu)
Importance: Undecided
Status: New
** Tags: apport-bug i386 lucid ubuntu-une
--
git interactive rebase fails with "shift: 1: can't shift that many"
https://bugs.launchpad.net/bugs/590197
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
