Re: [DOC PATCH]:git-starting.patch

[Jonathan Kulp]

Trevor Daniels wrote:
> Yup, worked fine here too.  Looks like you have a
> working recipe now.
>
> But this patch only contained the @q stuff -
> "lastest" is still there in the file!
>
> Trevor

Geez, it's always something.  I don't see how this is possible because 
lastest is nowhere to be found on my copies of the file. According to 
git, my files are already up-to-date.  How do I get the lastest version 
of git-starting now since git already thinks I have it?  Also, it seems 
I don't have a working recipe if it doesn't create a patch for all of 
the changes I made.  See if you can see where things went wrong:

1. I made the "lastest" to latest change.
2. git add git-starting.itexi
3. Made the changes to the @qq{} constructs and saved file
4. git commit -a
5. git format-patch origin
6. sent patch that Trevor found had problems, including that it lacked 
all the @qq{} fixes
7. git status reported that git-starting.itexi had changes not yet committed
8. git add git-starting.itexi
9. git commit -a
10. git format-patch origin/master
11. sent patch that worked for Carl & Trevor but no longer had the 
"lastest" fix.

It seems to me that I should have waited to do the "git add" command 
until I had made *all* changes to the file.  I was under the impression 
that once I added it to the staging area it would keep track of all the 
changes and then when I committed, it would commit all changes,  not 
just the ones made until the first git-add command.  Help!

In the meantime, how can I get the current version of that one file into 
my branch without having to rebranch the whole thing?

Best,

Jon

--
Jonathan Kulp
http://www.jonathankulp.com