From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Hendy Subject: Re: Assistance with patching instructions on Worg Date: Fri, 31 Jan 2014 15:58:31 -0600 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54565) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W9M6b-0000Rk-8V for emacs-orgmode@gnu.org; Fri, 31 Jan 2014 16:58:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W9M6a-0005yh-5m for emacs-orgmode@gnu.org; Fri, 31 Jan 2014 16:58:33 -0500 Received: from mail-oa0-x235.google.com ([2607:f8b0:4003:c02::235]:45441) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W9M6a-0005yW-04 for emacs-orgmode@gnu.org; Fri, 31 Jan 2014 16:58:32 -0500 Received: by mail-oa0-f53.google.com with SMTP id m1so5768150oag.26 for ; Fri, 31 Jan 2014 13:58:31 -0800 (PST) In-Reply-To: List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: "Thomas S. Dye" Cc: emacs-orgmode On Fri, Jan 31, 2014 at 3:50 PM, Thomas S. Dye wrote: > Hi John, > > John Hendy writes: > >> Greetings, >> >> >> I've only contributed to Worg, not the Org manual. I want to submit a >> change to the documentation per an earlier discussion.[1] I'm >> attempting to follow the Worg suggestion for submitting patches.[2] >> >> Here was my process >> >> cd ~/.elisp/org.git >> git pull >> make clean && make >> >> git branch org-src-preserve-whitespace >> git checkout org-src-preserve-whitespace >> >> emacs doc/org.texi >> >> [make changes to documentation] >> >> git commit -m "Update documentation to org-src-preserve-indentation." >> >> git format-patch master > > Here is what I do: > > 1. commit your changes to your local copy of the org-mode repository > > 2. run the following command to wrap up the latest commit on your > local copy of the repository into a file which can be attached > to email messages > > git format-patch -o ~/temp/ HEAD~1 > > after the command finished you will notice a new file in ~/temp > with a name like 0001-commit-message-stuff.patch > I can try that, though I'll have to try and figure out how to "un git commit -am" my file so that I can see if it works with just having done "git commit -m". Otherwise, I'll just futz with another file and try your process. Based on the Worg instructions... is your way preferred, or was anything wrong with my process such that Worg's instructions *should have* worked? It seems that they wouldn't work as-is, so if that's the case, I'll update Worg with the best practice per the list's input. John > hth, > Tom > > -- > Thomas S. Dye > http://www.tsdye.com