Hi, I'm a newbie and I'm using: - git-svn to connect to a public SVN repo, - StGit to manage my patches for the project hosted by this repo. The current GIT repo was previously cloned from a GIT repo made with git-cvsimport. But the project moved to SVN, so I removed the GIT repo connected to the CVS. I succesfully fetch the SVN, create a "work" local branch (connected to remotes/trunk), and create some patches. As the SVN evolved, I wish to retrieve info and update my patches. So I tried a "stg pull" whihc failed because "origin" no more exists. So, I tried a "git-rebase remotes/trunk". Is it correct? I'm actually unable to conclude, as the maintainer apply my patches with some improves, so I have to solve lots of conflicts. But I would appreciate if you can confirm me that the git-rebase is the good way to update a "workspace" managed both by git-svn and StGit. -- Guilhem BONNEFILLE -=- #UIN: 15146515 JID: guyou@im.apinc.org MSN: guilhem_bonnefille@hotmail.com -=- mailto:guilhem.bonnefille@gmail.com -=- http://nathguil.free.fr/ - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
| Bron Gondwana | BUG: mmapfile/writev spurious zero bytes (x86_64/not i386, bisected, reproducable) |
| Greg Kroah-Hartman | [PATCH 012/196] nozomi driver |
| J.C. Pizarro | Re: linux+glibc memory allocator, poor performance |
| Pavel Roskin | ndiswrapper and GPL-only symbols redux |
git: | |
| Andy Parkins | svn:externals using git submodules |
| Linus Torvalds | Re: fatal: Out of memory, malloc failed |
| Peter Karlsson | RCS keyword expansion |
| Dennis Schridde | Odd number of elements in anonymous hash |
| Jarek Poplawski | [PATCH 00/14]: Killing qdisc->ops->requeue(). |
| jamal | [PATCH 2/3][NET_BATCH] net core use batching |
| Patrick McHardy | pkt_sched: add DRR scheduler |
| Marcel Holtmann | Bluetooth fixes for 2.6.27 |
| Charlie Clark | openbsd fail2ban |
| Hari | DHCP question |
| Richard Stallman | Real men don't attack straw men |
| Nick Guenther | Re: When will OpenBSD support UTF8? |
