emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Jason Riedy <jason@acm.org>
To: Carsten Dominik <dominik@science.uva.nl>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH 0/4] Adding orgtbl-to-orbtbl and cleaning orgtbl-to-sqlinsert.
Date: Sun, 04 May 2008 23:34:15 -0700	[thread overview]
Message-ID: <871w4hl0ns.fsf@sparse.dyndns.org> (raw)
In-Reply-To: <5B2297B6-7026-46F8-AD40-574AA4F7CDB8@science.uva.nl> (Carsten Dominik's message of "Mon, 5 May 2008 07:15:43 +0200")

And Carsten Dominik writes:
>> git://repo.or.cz/org-mode/ejr.git master
>
> Can you explain to step by step what I would have to do to
> pull these changes from your repository into a local branch in my own
> repository?  Thanks.

One long-term version is to add that repo as a named remote:
  git remote add ejr git://repo.or.cz/org-mode/ejr.git
Then you can update all your remotes in one go:
  git remote update
Or just grab one:
  git fetch ejr
If you want to remove that remote repo later, use
  git remote rm ejr
After fetching,
  git branch -r
should list the remote branches, including ejr/master, or
  git branch -a
lists all of the branches.

A short-term version is just
  git fetch git://repo.or.cz/org-mode/ejr.git master:refs/heads/ejr-tmp
to slurp it into a local ejr-tmp branch.  The typical
  git branch -D ejr-tmp
would delete that branch.  Note that for deleting branches
added via git remote, you need to pass -r to git branch as well.

The command
  git log -p --stat --color ..ejr/master
should give a pretty, colorized listing of the changes in
ejr/master and not in your current index.  Just
  git diff --color ..ejr/master
should give a colorized diff between your index and ejr/master.
You can base those off HEAD, i.e. HEAD..ejr/master, to see the
differences between your currently committed work and the named
branch (ejr/master).

The difference between HEAD and your current (unnamed) index
only matters if you've added changes to your index explicitly
(through git add) or implicitly (through a partial merge).
The "OUTPUT FORMAT" section of git-diff's man page (conveniently
also available as git diff --help) gives a list of which
sub-commands provide which diffs, in case you feel like poking
around to get a feel for how each level works.

Many of these work in various forms through Emacs and eshell, but
I admit I rarely use them directly from Emacs.  And git has many
more, newer gadgets that may be nicer.  The few simple tools fit
how I think well enough that I kinda stopped following the
improvements.

As an alternate method not using remotes, you could just save the
patches to an mbox (say ejr-silly-patches.mbox), create a branch,
then use
  git am ejr-silly-patches.mbox
to import the patches.  Some people prefer that method, and it
can make replying with corrections and requests a bit easier
if your mail reader can poke around individual mbox files.

And to save some digging in man pages and annoyance in the
future, applying a patch that adds files is easiest with
  git apply --index foo.patch
That option will add the changes, including new files, to the
index directly.  Then to see the differences before committing, you
need git diff HEAD.  Just using git apply does not update the
index and hence won't include the new files automatically, so
you'd need to find them and add them.

Jason

      reply	other threads:[~2008-05-05  6:34 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-05  1:54 [PATCH 0/4] Adding orgtbl-to-orbtbl and cleaning orgtbl-to-sqlinsert Jason Riedy
2008-05-05  1:54 ` [PATCH 1/4] Provide an *orgtbl-default-fmt* for entries not in a fmt plist Jason Riedy
2008-05-05  1:54   ` [PATCH 2/4] Allow an explicitly nil :tstart and :tend to suppress the strings Jason Riedy
2008-05-05  1:54     ` [PATCH 3/4] Add an orgtbl-to-orgtbl transformation Jason Riedy
2008-05-05  1:54       ` [PATCH 4/4] Clean up orgtbl-sqlinsert Jason Riedy
2008-05-05  5:15 ` [PATCH 0/4] Adding orgtbl-to-orbtbl and cleaning orgtbl-to-sqlinsert Carsten Dominik
2008-05-05  6:34   ` Jason Riedy [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=871w4hl0ns.fsf@sparse.dyndns.org \
    --to=jason@acm.org \
    --cc=dominik@science.uva.nl \
    --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).