emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: John Hendy <jw.hendy@gmail.com>
To: Bastien <bastien.guerry@wikimedia.fr>
Cc: Carsten Dominik <cdominik@newartisans.com>, emacs-orgmode@gnu.org
Subject: Re: [Accepted] Re: [PATCH] Table caption produces trailing "nil" in pdf export
Date: Thu, 12 Aug 2010 15:55:43 -0500	[thread overview]
Message-ID: <AANLkTim+VzygDtEAmQ_5jEKeprX3aQSBbchgLdaTrB3R@mail.gmail.com> (raw)
In-Reply-To: <87pqxnhq3r.fsf@gnu.org>


[-- Attachment #1.1: Type: text/plain, Size: 1225 bytes --]

Worked like a charm. Thanks Bastien!

John

On Thu, Aug 12, 2010 at 9:18 AM, Bastien <bastien.guerry@wikimedia.fr>wrote:

> 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
>

[-- Attachment #1.2: Type: text/html, Size: 1860 bytes --]

[-- Attachment #2: Type: text/plain, Size: 201 bytes --]

_______________________________________________
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

  reply	other threads:[~2010-08-12 20:55 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-10 19:36 Table caption produces trailing "nil" in pdf export John Hendy
2010-08-10 20:48 ` [PATCH] " Nicolas Goaziou
2010-08-11  7:50   ` [Accepted] " Carsten Dominik
2010-08-12 13:56     ` John Hendy
2010-08-12 14:18       ` Bastien
2010-08-12 20:55         ` John Hendy [this message]
2010-08-10 21:07 ` David Maus
2010-08-10 21:14   ` John Hendy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=AANLkTim+VzygDtEAmQ_5jEKeprX3aQSBbchgLdaTrB3R@mail.gmail.com \
    --to=jw.hendy@gmail.com \
    --cc=bastien.guerry@wikimedia.fr \
    --cc=cdominik@newartisans.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).