[FFmpeg-devel] git ffmpeg/Xbmc lockup

Michael Niedermayer michaelni at gmx.at
Sat Jan 7 18:44:36 CET 2012

On Sat, Jan 07, 2012 at 10:07:00AM -0700, Kelly Anderson wrote:
> On 01/07/2012 10:03 AM, Hendrik Leppkes wrote:
> >Hi,
> >>"git show d185278" and "git diff f5be84c..d185278" should be showing pretty
> >>much the same commit.
> >>But there's a whole bunch of crap that actually got changed when you see the
> >>output of the git diff.
> >>
> >You can't take the chronological order as shown by the web interface
> >as anything but an overview. The actual parent of d185278 is 4278023.
> >The web interface sadly doesn't show the full truth, because of the
> >merges from libav. Its not a linear history.
> I'm using git log for my history.  So I'm not sure whether that's
> linear or not.

you can use
git log --graph
git log --graph --pretty=oneline
to see the parent/child relationship
there are also various GUI tools that can do that

> I'll apply that patch and see if fixes the problem.

Please do, if it works ill push it to master

Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Why not whip the teacher when the pupil misbehaves? -- Diogenes of Sinope
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120107/d2ee2f4f/attachment.asc>

More information about the ffmpeg-devel mailing list