From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nick Dokos Subject: Re: Assistance with patching instructions on Worg Date: Fri, 31 Jan 2014 17:51:09 -0500 Message-ID: <87iosz934y.fsf@alphaville.bos.redhat.com> References: <87y51veqo3.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W9Mvr-0002n2-PO for emacs-orgmode@gnu.org; Fri, 31 Jan 2014 17:51:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W9Mvk-0003nj-Do for emacs-orgmode@gnu.org; Fri, 31 Jan 2014 17:51:31 -0500 Received: from plane.gmane.org ([80.91.229.3]:43057) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W9Mvk-0003nd-6r for emacs-orgmode@gnu.org; Fri, 31 Jan 2014 17:51:24 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1W9Mvi-0006zs-Gv for emacs-orgmode@gnu.org; Fri, 31 Jan 2014 23:51:22 +0100 Received: from nat-pool-bos-t.redhat.com ([66.187.233.206]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 31 Jan 2014 23:51:22 +0100 Received: from ndokos by nat-pool-bos-t.redhat.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 31 Jan 2014 23:51:22 +0100 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: emacs-orgmode@gnu.org John Hendy writes: > On Fri, Jan 31, 2014 at 4:23 PM, Josiah Schwab wrote: >> >> jw.hendy@gmail.com writes: >> >>> emacs doc/org.texi >>> >>> [make changes to documentation] >>> >>> git commit -m "Update documentation to org-src-preserve-indentation." >>> >>> git format-patch master >>> >>> But no files were generated... Am I doing something incorrectly? >> >> Yes. You need to explicitly add your changes to the index. >> >> git add doc/org.text >> >> then git commit -m "message" will behave as you expect. >> >> (Using "git commit -a" worked, because that is like doing a "git add" to >> all modified files.) >> >> It sounds like you misunderstand what "git add" does. If you read a >> little bit more about git workflows, I think it will make sense to you. > > Perhaps, though I'm familiar with `git -am "comment"` on my own stuff. > I was just following along with Worg, which doesn't mention doing > that. I'm now thinking that `git add` must be implied in the line > =make some changes (1)=? > No, it does need the git add (or equivalently in this case, git commit -a). Worg is wrong, so if you could fix it, that would be good. One additional point: ``git status'' is invaluable. The first thing I do when I go into a git repo or after an interruption is ``git status'' to orient myself. It tells me what branch I'm on, what files are modified, what files have been added already so they will be part of the next commit, what files are present but not part of the repo and it gives you explicit instructions about how to undo anything that is not right *before* you commit. Nick