[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Strange documentation snippets update
From: |
Graham Percival |
Subject: |
Re: Strange documentation snippets update |
Date: |
Sat, 24 May 2008 13:27:48 -0700 |
On Sat, 24 May 2008 15:59:13 +0200
John Mandereau <address@hidden> wrote:
> On 2008/05/24, Neil Puttock wrote:
>
> > Could there be something wrong with the patch? It's attached if you
> > want to have a look.
>
> The patch looks fine.
Oops, my fault. I applied the patch and compiled it, but ended up
with an untracked file (that indicating... thing) so I just
deleted it.
> Graham, I'm almost sure you tested docs compilation before pushing to
> Git, but might have you applied the patch with 'patch' command and
> forgot to add the file to Git?
Of course I used `patch'. It's one less git idiodicy to deal
with.
> I would recommend to apply patches formatted with git-format-patch
> with 'git am 0001-commit-foo.patch', which requires less fussing with
> Git in case the patch applies cleanly: git-am adds and deletes files
> automatically, and it commits automatically with original message and
> author.
Hmm, ok. I'll try that next time.
Cheers,
- Graham