See below. Using stg with git commit --amend creates big problems, yet stg has no way (?) to alter commit descriptions. Any advice? Thanks -- Andy [agrover@sitar git]$ stg version Stacked GIT 0.12.1 git version 1.5.2.4 Python version 2.5 (r25:51908, Apr 10 2007, 10:27:40) [GCC 4.1.2 20070403 (Red Hat 4.1.2-8)] [agrover@sitar git]$ stg clone linux-2.6/ stg-smp Cloning "linux-2.6/" into "stg-smp"... Initialized empty Git repository in /home/agrover/git/stg-smp/.git/ remote: Generating pack... remote: Done counting 551375 objects. remote: Deltifying 551375 objects... remote: 100% (551375/551375) done Indexing 551375 objects... remote: Total 551375 (delta 447865), reused 551375 (delta 447865) 100% (551375/551375) done Resolving 447865 deltas... 100% (447865/447865) done Checking 22473 files out... 100% (22473/22473) done done [agrover@sitar git]$ cd stg-smp/ [agrover@sitar stg-smp]$ stg import -t ~/mps_removal1.patch Checking for changes in the working directory... done Importing patch "mps_removal1"... done Now at patch "mps_removal1" [agrover@sitar stg-smp]$ git commit --amend Created commit aaa2eb2: new text 3 files changed, 1 insertions(+), 470 deletions(-) [agrover@sitar stg-smp]$ stg pop stg pop: HEAD and top are not the same. You probably committed changes to the tree outside of StGIT. To bring them into StGIT, use the "assimilate" command [agrover@sitar stg-smp]$ stg assimilate stg assimilate: Commit 5a99efeaa5c7139b7d76cbd5fb54fac664ba3da9 is a merge, aborting - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
