From: Nick Dokos <ndokos@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: Assistance with patching instructions on Worg
Date: Fri, 31 Jan 2014 17:51:09 -0500 [thread overview]
Message-ID: <87iosz934y.fsf@alphaville.bos.redhat.com> (raw)
In-Reply-To: CA+M2ft_52tnY-G_fsBLkwmfNiK6-cv_ST3fyX2QAdG-aTkJ2=Q@mail.gmail.com
John Hendy <jw.hendy@gmail.com> writes:
> On Fri, Jan 31, 2014 at 4:23 PM, Josiah Schwab <jschwab@gmail.com> 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
next prev parent reply other threads:[~2014-01-31 22:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-31 21:33 Assistance with patching instructions on Worg John Hendy
2014-01-31 21:50 ` Thomas S. Dye
2014-01-31 21:58 ` John Hendy
2014-01-31 22:23 ` Josiah Schwab
2014-01-31 22:34 ` John Hendy
2014-01-31 22:51 ` Nick Dokos [this message]
2014-01-31 22:57 ` Josiah Schwab
2014-01-31 22:59 ` John Hendy
2014-02-02 15:27 ` John Hendy
2014-02-02 17:28 ` Bastien
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=87iosz934y.fsf@alphaville.bos.redhat.com \
--to=ndokos@gmail.com \
--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).