emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: suvayu ali <fatkasuvayu+linux@gmail.com>
To: Matt Price <moptop99@gmail.com>
Cc: bzg@altern.org, emacs-orgmode@gnu.org,
	Jambunathan K <kjambunathan@gmail.com>
Subject: Re: New feature branch: org-xhtml-and-org-odt
Date: Mon, 14 Nov 2011 21:28:20 +0100	[thread overview]
Message-ID: <CAMXnza1XnqqGtfEtis35sL=_=SwQXhy4hBESLbLHA5CghAV6kg@mail.gmail.com> (raw)
In-Reply-To: <CAN_Dec-h4zm6RrCXP2fsub7Z3Pm-8wgYMuLHYefRboEv85=wVA@mail.gmail.com>

Hi Matt,

On Mon, Nov 14, 2011 at 21:06, Matt Price <moptop99@gmail.com> wrote:
> hmm, what are the pul instructions for this? sorry, my git-fu is pretty
> basic: I tried
> git pull origin/org-xhtml-and-org-odt
> and
> git pull org-xhtml-and-org-odt

With master checked out (git checkout master), do the following:

$ git pull
$ git checkout -b <some_name_u_like> origin/org-xhtml-and-org-odt

Now you are on the <some_name_u_like> branch which tracks
origin/org-xhtml-and-org-odt. Now you can compile, experiment whatever.
When you have had enough fun, to get back to master do the following:

$ git checkout master

Any subsequent updates to the branch from Jambunathan will be pulled in
automatically when you do `git pull' in the future. However your local
branch tracking origin/org-xhtml-and-org-odt will not be updated. To do
that do the following:

$ git checkout <some_name_u_like>
$ git pull -f

The `-f' is there to deal with situations when Jambunathan rebases his
branch on top of the latest master (this is common practice for topic
branches).

Hope this helps.

-- 
Suvayu

Open source is the future. It sets us free.

      reply	other threads:[~2011-11-14 20:28 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-14  8:13 New feature branch: org-xhtml-and-org-odt Jambunathan K
2011-11-14  8:41 ` Jambunathan K
2011-11-15 19:35   ` Bastien
2011-11-14 12:29 ` joakim
2011-11-15 19:39   ` Bastien
2011-11-16  8:51     ` joakim
2011-11-16  9:09       ` Bastien
2011-11-16 10:01         ` joakim
2011-11-14 20:06 ` Matt Price
2011-11-14 20:28   ` suvayu ali [this message]

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='CAMXnza1XnqqGtfEtis35sL=_=SwQXhy4hBESLbLHA5CghAV6kg@mail.gmail.com' \
    --to=fatkasuvayu+linux@gmail.com \
    --cc=bzg@altern.org \
    --cc=emacs-orgmode@gnu.org \
    --cc=kjambunathan@gmail.com \
    --cc=moptop99@gmail.com \
    /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).