f10e18dca...<http://github.com/insoshi/insoshi/commit/f10e18dca92fdbfaf97928b8944eacf2082925b7>(autogenerated commit) doesn't have any diffs associated with it but is recording that the merge took place. If you look at its description, you'll see that it has two parents. This indicates that the version of Insoshi you'd see is based on the two branches that those parent commits represent. The log is empty because no conflicts needed to be resolved as a result of the merge.
If you take a look at 8ec714e1...<http://github.com/insoshi/insoshi/commit/8ec714e1f1dc7c789f003e3a63c3ba3345ff54f7>(a "regular" commit), it only has one parent. So the version of Insoshi you're seeing at this point is the parent plus the diffs that were recorded as part of the commit. Long On Thu, Jun 12, 2008 at 7:05 AM, Kyrre Nygård <[EMAIL PROTECTED]> wrote: > > i was curious because, at least on github, the commit log seems empty > (maybe i'm missing something) > > > http://github.com/insoshi/insoshi/commit/f10e18dca92fdbfaf97928b8944eacf2082925b7 > > as compared to for instance > > > http://github.com/insoshi/insoshi/commit/8ec714e1f1dc7c789f003e3a63c3ba3345ff54f7 > > On Jun 11, 6:36 pm, "Long Nguyen" <[EMAIL PROTECTED]> wrote: > > You'll always be able to see what's changed in the Insoshi releases: All > > that commit information does get from the private Git repository to the > > public GitHub repository. That's part of the design of Git. > > > > The autogenerated commit records the 1) updates to files that were made > as > > part of the "git merge" command when we're consolidating the work done on > > parallel development branches in order to include them in the release and > 2) > > that the merge did take place (the commit has parent commits from both > > branches). If you don't see any diffs associated with this kind of > commit, > > then it means that the merging was "clean" (didn't require manual merges > so > > all the file changes are already contained in the parent commits). > > > > The private Git repository is used so we can version internal > development. > > This includes updates that are currently in progress (not ready to be > > released) and parallel development branches (to work on some features or > > fixes in isolation). It's our "local repository" but maintained at a > hosted > > location in case anything unfortunate happens to our laptops. > > > > Long > > > > On Wed, Jun 11, 2008 at 5:47 AM, Kyrre Nygård <[EMAIL PROTECTED]> > wrote: > > > > > Following Michael's Merge branch 'master' of > > > [EMAIL PROTECTED]:instantsocial 4 days ago -- and Long's comment on > > > GitHub: "We maintain a private Git repository to store changes before > > > we push them up to GitHub. It's our primary (aka origin) for internal > > > development. That autogenerated commit message includes that remote > > > information." -- how can we then know what's changed, when all your > > > logs are at your private Git repository? > > > > -- > > Long Nguyen > > [EMAIL PROTECTED] > > > -- Long Nguyen [EMAIL PROTECTED] --~--~---------~--~----~------------~-------~--~----~ Insoshi developer site: http://dogfood.insoshi.com/ Insoshi documentation: http://docs.insoshi.com/ You received this message because you are subscribed to the Google Groups "Insoshi" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/insoshi?hl=en -~----------~----~----~----~------~----~------~--~---
