From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nick Dokos <nicholas.dokos@hp.com>
Subject: Re: [beamer] Code blocks in lists?
Date: Tue, 07 Feb 2012 18:21:04 -0500
Message-ID: <14684.1328656864@alphaville>
References: <807h00ktiu.fsf@somewhere.org> <874nv4umx3.fsf@gmail.com>
	<80vcnkq72r.fsf@somewhere.org> <87sjinude1.fsf@gmail.com>
	<808vke9skc.fsf@somewhere.org>
Reply-To: nicholas.dokos@hp.com
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:57115)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <nicholas.dokos@hp.com>) id 1RuuLY-00055L-TN
	for emacs-orgmode@gnu.org; Tue, 07 Feb 2012 18:21:19 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <nicholas.dokos@hp.com>) id 1RuuLT-0005cV-VX
	for emacs-orgmode@gnu.org; Tue, 07 Feb 2012 18:21:12 -0500
Received: from g4t0015.houston.hp.com ([15.201.24.18]:12567)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <nicholas.dokos@hp.com>) id 1RuuLT-0005cI-PC
	for emacs-orgmode@gnu.org; Tue, 07 Feb 2012 18:21:07 -0500
In-Reply-To: Message from "Sebastien Vauban" <wxhgmqzgwmuf@spammotel.com>
	of "Tue, 07 Feb 2012 23:39:31 +0100." <808vke9skc.fsf@somewhere.org>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Sebastien Vauban <wxhgmqzgwmuf@spammotel.com>
Cc: nicholas.dokos@hp.com, emacs-orgmode@gnu.org

Sebastien Vauban <wxhgmqzgwmuf@spammotel.com> wrote:


> >> Org-mode version 7.8.03 (release_7.8.03.356.gfe2e)
> >
> > Strange. This version doesn't exist yet. As the time of writing, we're
> > at release: Org-mode version 7.8.03 (release_7.8.03.321.gaac1c).
> 
> I have no idea why it's the case: I don't have any pending modification or
> whatsoever, and simply git pull every day or so. Though, my Git experience is
> still limited...
> 

Maybe there are spurious merge commits because of some unintentional
change you made?  In any case, try doing a ``git log -N'' and 
``git log -N origin/master'' for various values of N and see where
yours differs from origin/master.

If you really have nothing in your tree that is worth saving, then
the simplest way to get back in sync is to delete the whole org-mode
directory and clone it again - but you'd better double check!

Nick