On Sunday 01 November 2009, Øyvind Harboe wrote: > >> Hmm.... how do I read out which version a git patch is relative to? > > > > git show --pretty=raw 818cedaff > > > > instead of just "git show" (or "git log" etc). That includes > > parent IDs ... possibly more than one for merge commits, as in > > the example above. > > I would have expected a patch to show what the parent id was...
The notion of a "parent" is fuzzy ... if the patch can apply to a hundred different incarnations of a tree, which one is "the" parent? So the only time "parent" really makes sense is when talking about a particular integration history: in this branch, it merged right here. Historically, source code patches have been decoupled from base versions specifically so they can apply to as many versions as need that specific change/bugfix. > I can't run git show patches can I? "Run"? Yes, you can run that command above. Yes, you can apply those patches to other trees, modulo conflicting changes in those trees. The one above didn't happen to have any content, but it had two parents. _______________________________________________ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
