[vtk-developers] Stupid git question #2

[Moreland, Kenneth]

The previous answers have given more gity ways of solving the problem, but sometimes rather than fight with the git interface it's easier to simply use the git diff command to create a patch between your work branch (recently merged with master) and the master branch, then apply the patch to a fresh copy of the master.

-Ken


On 4/28/10 1:14 AM, "Biddiscombe, John A." <biddisco at cscs.ch> wrote:

OK, I still don't have my submodule stuff working, but that's ok, I know that eventually I'll find out how to wipe all my work and lose everything .... however, in the meantime.

git encourages you to commit things all the time. Even when you're not ready.

If I pull from remote/origin so that I can keep up to date every day, it likes me to commit my stuff first - or do a stash save, pull, apply, which is nice and avoids the problem ... but

I commit "Started work on feature X" , pull, commit "Got some stuff working", pull, commit "nearly there" etc etc

now after month of rubbish tiny commits, I finally have my useful implementation on my branch, and I rebase and want to commit my overall changes to the official repo, but I want to avoid all the daily commits which are meaningless on their own, and instead commit my branch feature to the head remote with a single "New implementation of algorithm X, uses Y,  and Z other algorithms to do this and that and supports options blah"
How can you turn all the little commits into a proper one? - and not lose all the synchronization of the repositories etc. (For example, I may make a pull from somewhere else to get something important, and this pull needs to be preserved in the log history of commits in the remote etc.)

I know I'm asking too much, but you can say rtfm (with a good link) if you want.

JB


_______________________________________________
Powered by www.kitware.com

Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://www.vtk.org/mailman/listinfo/vtk-developers





   ****      Kenneth Moreland
    ***      Sandia National Laboratories
***********
*** *** ***  email: kmorel at sandia.gov
**  ***  **  phone: (505) 844-8919
    ***      web:   http://www.cs.unm.edu/~kmorel

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20100428/256413f8/attachment.html>