From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Riedy Subject: Re: [PATCH 0/4] Adding orgtbl-to-orbtbl and cleaning orgtbl-to-sqlinsert. Date: Sun, 04 May 2008 23:34:15 -0700 Message-ID: <871w4hl0ns.fsf@sparse.dyndns.org> References: <1209952483-23714-1-git-send-email-jason@acm.org> <5B2297B6-7026-46F8-AD40-574AA4F7CDB8@science.uva.nl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JsuHE-0001oP-BZ for emacs-orgmode@gnu.org; Mon, 05 May 2008 02:34:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JsuHC-0001ns-TN for emacs-orgmode@gnu.org; Mon, 05 May 2008 02:34:20 -0400 Received: from [199.232.76.173] (port=37995 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JsuHC-0001nm-Ki for emacs-orgmode@gnu.org; Mon, 05 May 2008 02:34:18 -0400 Received: from a.mail.sonic.net ([64.142.16.245]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JsuHB-00087g-S3 for emacs-orgmode@gnu.org; Mon, 05 May 2008 02:34:18 -0400 In-Reply-To: <5B2297B6-7026-46F8-AD40-574AA4F7CDB8@science.uva.nl> (Carsten Dominik's message of "Mon, 5 May 2008 07:15:43 +0200") 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: Carsten Dominik Cc: emacs-orgmode@gnu.org 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