On Sun, Dec 6, 2009 at 11:03 AM, Vincent Legoll <[email protected]> wrote: > here's the recipe: > > 1) git stash # save current changes > 2) git stash apply # apply all stashed changes > 3) meld . # manually revert things to keep only a single change that > you want to separate > 4) git commit -a # commit it, you can do this form inside meld too > 5) go to 2) # restart until everything stashed is committed > > instead of exiting / launching meld again at 3) you can just use refresh
After the first round, you may need merging at stage 3) just merge as usual, then "git add" (or do it from within meld) then commit... -- Vincent Legoll _______________________________________________ meld-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/meld-list
