From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: Best Way to Submit a Patch Date: Mon, 15 Dec 2008 07:02:19 +0100 Message-ID: References: <49452CE8.8070104@manor-farm.org> Mime-Version: 1.0 (Apple Message framework v929.2) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LC6XA-0005EW-FX for emacs-orgmode@gnu.org; Mon, 15 Dec 2008 01:02:24 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LC6X9-0005E4-Jk for emacs-orgmode@gnu.org; Mon, 15 Dec 2008 01:02:24 -0500 Received: from [199.232.76.173] (port=56937 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LC6X9-0005E1-EP for emacs-orgmode@gnu.org; Mon, 15 Dec 2008 01:02:23 -0500 Received: from mail-ew0-f13.google.com ([209.85.219.13]:40752) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LC6X8-0000FD-OE for emacs-orgmode@gnu.org; Mon, 15 Dec 2008 01:02:23 -0500 Received: by ewy6 with SMTP id 6so2958210ewy.18 for ; Sun, 14 Dec 2008 22:02:21 -0800 (PST) In-Reply-To: <49452CE8.8070104@manor-farm.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: Ian Barton Cc: emacs-orgmode@gnu.org Hi Ian, there is lots of GIT documentation on the web. Here is a short way to do what you want. 1. get the latest changes git pull 2. create a branch for you to do your changes git checkout -b my-doc-fixed 3. Edit the file you want to change $ emacs .... $ emacs .... 4. Commit the changes when you feel like it git add doc/org.texi git commit 5. Create a patch git diff master > send-to-carsten.patch 6. Go back t the master branch for normal use of Org-mode. Do this only after committing all changes. git checkout master This all works fine when you don't pull new changes while working on your patch. If Org changes while you do your work, you can do this: - commit your changes as described above. - switch back to master git checkout master - get new changes git pull - return to your branch git checkout my-doc-fixes - make sure your changes are made relative to the current, new master: git rebase master - continue working on your patches. The only problem here is that git rebase can fail if there is overlap, so my recommendation for he beginner is to just use the workflow shown above. - Carsten P.S. I am *not* a GIT guru, I hope others will correct me if anything should be done differently. On Dec 14, 2008, at 4:57 PM, Ian Barton wrote: > I would like to submit some patches for the documentation. Whilst I > understand how to make a patch file, what should I be patching > against? I am running a clone of the git repo, so presume I can > somehow use git to create patches. Can someone point me to the > documentation on how to get started? > > I guess my first contribution should be "How to submit a patch" :) > > Ian. > > > > _______________________________________________ > Emacs-orgmode mailing list > Remember: use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode