From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Hendy Subject: Re: [Accepted] Re: [PATCH] Table caption produces trailing "nil" in pdf export Date: Thu, 12 Aug 2010 15:55:43 -0500 Message-ID: References: <87bp9a8a8b.wl%n.goaziou@gmail.com> <20100811075021.27EB91ACCA4F@carsten-dominiks-macbook-pro.local> <87pqxnhq3r.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1645251570==" Return-path: Received: from [140.186.70.92] (port=50573 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OjeoU-0006D5-12 for emacs-orgmode@gnu.org; Thu, 12 Aug 2010 16:55:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OjeoS-0002hD-Sd for emacs-orgmode@gnu.org; Thu, 12 Aug 2010 16:55:46 -0400 Received: from mail-vw0-f41.google.com ([209.85.212.41]:62688) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OjeoS-0002h8-PB for emacs-orgmode@gnu.org; Thu, 12 Aug 2010 16:55:44 -0400 Received: by vws16 with SMTP id 16so1198672vws.0 for ; Thu, 12 Aug 2010 13:55:43 -0700 (PDT) In-Reply-To: <87pqxnhq3r.fsf@gnu.org> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Bastien Cc: Carsten Dominik , emacs-orgmode@gnu.org --===============1645251570== Content-Type: multipart/alternative; boundary=0016369f9bc8f7cfab048da69669 --0016369f9bc8f7cfab048da69669 Content-Type: text/plain; charset=ISO-8859-1 Worked like a charm. Thanks Bastien! John On Thu, Aug 12, 2010 at 9:18 AM, Bastien wrote: > John Hendy 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 > ~$ git pull > > You can get 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 > --0016369f9bc8f7cfab048da69669 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Worked like a charm. Thanks Bastien!

John

On Thu, Aug 12, 2010 at 9:18 AM, Bastien <bastien.guerry@wikim= edia.fr> wrote:
John Hendy <jw.hendy@gmail.com> writes:

> Now that the patch is "official", how do I conduct my next g= it pull since I
> don't really want to commit my modified file in favor of the incom= ing 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. =A0Then you nee= d
=A0 to reset to HEAD and pull:

=A0 ~$ git reset --hard HEAD
=A0 ~$ git pull

2. you *did commit* your changes on your local repo. =A0Then you need to =A0 reset to a specific commit (i.e. the one from last pull) and pull:

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

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

Playing with gitk might also help.

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

HTH,

--
=A0Bastien

--0016369f9bc8f7cfab048da69669-- --===============1645251570== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode --===============1645251570==--