From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bastien <bastien.guerry@wikimedia.fr>
Subject: Re: [Accepted] Re: [PATCH] Table caption produces trailing "nil" in
 pdf export
Date: Thu, 12 Aug 2010 16:18:00 +0200
Message-ID: <87pqxnhq3r.fsf@gnu.org>
References: <87bp9a8a8b.wl%n.goaziou@gmail.com>
	<20100811075021.27EB91ACCA4F@carsten-dominiks-macbook-pro.local>
	<AANLkTi=WS-3NEuuLTthQQcbLoY3Ay5DRpN8hdDb9pp54@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=59012 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OjYbg-0006ak-G3
	for emacs-orgmode@gnu.org; Thu, 12 Aug 2010 10:18:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <bastienguerry@googlemail.com>) id 1OjYbb-0002Hm-W6
	for emacs-orgmode@gnu.org; Thu, 12 Aug 2010 10:18:07 -0400
Received: from mail-wy0-f169.google.com ([74.125.82.169]:51518)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <bastienguerry@googlemail.com>) id 1OjYbb-0002HU-Rw
	for emacs-orgmode@gnu.org; Thu, 12 Aug 2010 10:18:03 -0400
Received: by wyg36 with SMTP id 36so1602032wyg.0
	for <emacs-orgmode@gnu.org>; Thu, 12 Aug 2010 07:18:02 -0700 (PDT)
In-Reply-To: <AANLkTi=WS-3NEuuLTthQQcbLoY3Ay5DRpN8hdDb9pp54@mail.gmail.com>
	(John Hendy's message of "Thu, 12 Aug 2010 08:56:44 -0500")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/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: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: John Hendy <jw.hendy@gmail.com>
Cc: Carsten Dominik <cdominik@newartisans.com>, emacs-orgmode@gnu.org

John Hendy <jw.hendy@gmail.com> writes:

> Now that the patch is "official", how do I conduct my next git pull since I
> don't really want to commit my modified file in favor of the incoming from the
> git server?

If your patch comes from a temporary branch, just checkout the master
branch (~$ git checkout master) and pull normally with ~$ git pull.

(This is the advantage of working in branches: you'll always be able to
pull from the master branch.)

If your patch comes from the master branch, two cases:

1. you *didn't commit* your changes on your local repo.  Then you need
   to reset to HEAD and pull:

   ~$ git reset --hard HEAD
   ~$ git pull
   
2. you *did commit* your changes on your local repo.  Then you need to
   reset to a specific commit (i.e. the one from last pull) and pull:

   ~$ git reset --hard <commit>
   ~$ git pull

You can get <commit> with ~$ git log.

Playing with gitk might also help.

http://book.git-scm.com/4_undoing_in_git_-_reset,_checkout_and_revert.html
will give more details.

HTH,

-- 
 Bastien