git has the advantage of having more infrastructure (GUIs for example). But some of the stuff that quilt was designed for is buried in exotic commands in git.
'git help <command>' brings up the docs, 'git help git' lists all commands. 'git svn clone' creates a local git clone of an svn repo 'git svn rebase' pulls the latest changes from svn; it removes your local commits and re-applies them on top of the newest svn revision 'git stash' lets you stash away changes to the local working dir if you need a clean tree, for example for 'git svn rebase' In git you add all your changes for the next commit to an "index" or "staging area" before you run commit: 'git add' adds changes to the index 'git add -p' is an interactive command allows you to pick individual diff hunks rather than all changes in a file for inclusion in the index 'git commit' turns the changes collected in the index into a commit stuff added to the index doesn't turn up in regular 'git diff' you need 'git diff --cached' (or 'git diff --staged') to show whats in the index 'git reset --mixed' forgets the index while not touching the working dir 'git rebase' allows you to manipulate past commits, re-ordering/merging/splitting (haven't tried the latter) 'git reset --hard <revision>' kills all revisions that were committed after <revision> and changes the working dir to <revision> (unless you branched) 'gitk' is a gui to browse through the repo and do some things like generating patches 'git-citool' is a gui that supposedly helps you with the whole index/commit thing Michael On Sun, May 31, 2009 at 4:10 AM, David Brownell <davi...@pacbell.net> wrote: > On Saturday 30 May 2009, Peter Denison wrote: >> Quilt. It's exactly the tool to do this. > > Exactly. You're working with a series of patches all > the time, so there's no special step to create one. > > It's also a good way to work with semi-stable snapshots > while you finish stabilizing your work. You develop a > series of "good" modular patches, test, debug, clean up; > updating to a new base snapshot is just reverting all > your patches, making sure the workspace is clean, then > pulling in a new version and re-applying the patches. > (They can need tweaking though.) > > It can also be done with "git" commands, but I've gotten > into the habit of using quilt instead. > > - Dave > _______________________________________________ > Openocd-development mailing list > Openocd-development@lists.berlios.de > https://lists.berlios.de/mailman/listinfo/openocd-development > _______________________________________________ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
